aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2002-12-07 11:38:26 +0000
committerMichael Niedermayer <michaelni@gmx.at>2002-12-07 11:38:26 +0000
commit2b2719acffb74134613a13661d3c4dc236226346 (patch)
treef7854743eeb76a9419de73e9f660f24afcc4baea
parent00a7d8d69c2f63ac4a2de1b2237696a516f8d5d2 (diff)
downloadffmpeg-2b2719acffb74134613a13661d3c4dc236226346.tar.gz
ump4 decoding fixed
Originally committed as revision 1322 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/h263.c2
-rw-r--r--libavcodec/h263dec.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h263.c b/libavcodec/h263.c
index 98b29ad0b4..80c9a3adc8 100644
--- a/libavcodec/h263.c
+++ b/libavcodec/h263.c
@@ -3624,7 +3624,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
#if 1
{
const int abs_level= ABS(level);
- if(abs_level<=MAX_LEVEL && run<=MAX_RUN){
+ if(abs_level<=MAX_LEVEL && run<=MAX_RUN && !(s->workaround_bugs&FF_BUG_AC_VLC)){
const int run1= run - rl->max_run[last][abs_level] - 1;
if(abs_level <= rl->max_level[last][run]){
fprintf(stderr, "illegal 3. esc, vlc encoding possible\n");
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 1f8fb44a88..2ac68060f9 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -442,13 +442,13 @@ retry:
if(s->workaround_bugs&FF_BUG_AUTODETECT){
if(s->avctx->fourcc == ff_get_fourcc("XVIX"))
s->workaround_bugs|= FF_BUG_XVID_ILACE;
-
+#if 0
if(s->avctx->fourcc == ff_get_fourcc("MP4S"))
s->workaround_bugs|= FF_BUG_AC_VLC;
if(s->avctx->fourcc == ff_get_fourcc("M4S2"))
s->workaround_bugs|= FF_BUG_AC_VLC;
-
+#endif
if(s->avctx->fourcc == ff_get_fourcc("UMP4")){
s->workaround_bugs|= FF_BUG_UMP4;
s->workaround_bugs|= FF_BUG_AC_VLC;