diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2012-03-07 16:58:03 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2012-03-07 16:58:03 -0800 |
| commit | 381f475475b11a552a5233c48947cc570c28b1d8 (patch) | |
| tree | 8720d606e78c4225f90743f1ce517babeb651f89 /media/libstagefright/codecs/m4v_h263 | |
| parent | b279312a9038b9c5b9b05b31b1b1db86f748efd8 (diff) | |
| parent | 6a26abbafe8d9a9c2250afcc037c3db5e9d1b42a (diff) | |
| download | frameworks_av-381f475475b11a552a5233c48947cc570c28b1d8.zip frameworks_av-381f475475b11a552a5233c48947cc570c28b1d8.tar.gz frameworks_av-381f475475b11a552a5233c48947cc570c28b1d8.tar.bz2 | |
resolved conflicts for merge of 532679a5 to master
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
Diffstat (limited to 'media/libstagefright/codecs/m4v_h263')
| -rw-r--r-- | media/libstagefright/codecs/m4v_h263/dec/src/vop.cpp | 2 |
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; } |