summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2012-03-05 22:55:49 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-05 22:55:49 -0800
commit6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a (patch)
tree11a017ac26b89b7def167dcc619180392feb7489 /media/libstagefright
parentd1aeb29912c93863a05b8023bc30cd139c97c5f5 (diff)
parent083644fee99d23491554484301943e6a7daf262b (diff)
downloadframeworks_av-6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a.zip
frameworks_av-6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a.tar.gz
frameworks_av-6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a.tar.bz2
am 4d7bc655: Doc change: String changes for Android Market
* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219': Doc change: String changes for Android Market
Diffstat (limited to 'media/libstagefright')
-rw-r--r--media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
index 74fe478..b3c350f 100644
--- a/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
+++ b/media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp
@@ -1041,7 +1041,7 @@ PV_STATUS DecodeShortHeader(VideoDecData *video, Vop *currVop)
/* Marker Bit */
if (!BitstreamRead1Bits(stream))
{
- mp4dec_log("DecodeShortHeader(): Market bit wrong.\n");
+ mp4dec_log("DecodeShortHeader(): Marker bit wrong.\n");
status = PV_FAIL;
goto return_point;
}