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 | e61cad321d2888f2b6b7e0322158211e3b3e0c46 (patch) | |
| tree | 8b52920190e2ccd1a38c4b21a9af97ec3f41d288 /media/libstagefright | |
| parent | 78c914f37a9891bc24f335fcf8c628beeb9310f5 (diff) | |
| parent | 532679a5ed196ae8cfcdda5cc8a41252368cc9e5 (diff) | |
| download | frameworks_base-e61cad321d2888f2b6b7e0322158211e3b3e0c46.zip frameworks_base-e61cad321d2888f2b6b7e0322158211e3b3e0c46.tar.gz frameworks_base-e61cad321d2888f2b6b7e0322158211e3b3e0c46.tar.bz2 | |
resolved conflicts for merge of 532679a5 to master
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
Diffstat (limited to 'media/libstagefright')
| -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; } |