virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

ump4 decoding fixed

Browse Source 
Originally committed as revision 1322 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2002-12-07 11:38:26 +00:00
parent 00a7d8d69c
commit 2b2719acff
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h263.c
View File

@ -3624,7 +3624,7 @@ static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
#if 1 #if 1
{ {
const int abs_level= ABS(level); 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; const int run1= run - rl->max_run[last][abs_level] - 1;
if(abs_level <= rl->max_level[last][run]){ if(abs_level <= rl->max_level[last][run]){
fprintf(stderr, "illegal 3. esc, vlc encoding possible\n"); fprintf(stderr, "illegal 3. esc, vlc encoding possible\n");

4
libavcodec/h263dec.c
View File

@ -442,13 +442,13 @@ retry:
if(s->workaround_bugs&FF_BUG_AUTODETECT){ if(s->workaround_bugs&FF_BUG_AUTODETECT){
if(s->avctx->fourcc == ff_get_fourcc("XVIX")) if(s->avctx->fourcc == ff_get_fourcc("XVIX"))
s->workaround_bugs|= FF_BUG_XVID_ILACE; s->workaround_bugs|= FF_BUG_XVID_ILACE;
#if 0
if(s->avctx->fourcc == ff_get_fourcc("MP4S")) if(s->avctx->fourcc == ff_get_fourcc("MP4S"))
s->workaround_bugs|= FF_BUG_AC_VLC; s->workaround_bugs|= FF_BUG_AC_VLC;
if(s->avctx->fourcc == ff_get_fourcc("M4S2")) if(s->avctx->fourcc == ff_get_fourcc("M4S2"))
s->workaround_bugs|= FF_BUG_AC_VLC; s->workaround_bugs|= FF_BUG_AC_VLC;
#endif
if(s->avctx->fourcc == ff_get_fourcc("UMP4")){ if(s->avctx->fourcc == ff_get_fourcc("UMP4")){
s->workaround_bugs|= FF_BUG_UMP4; s->workaround_bugs|= FF_BUG_UMP4;
s->workaround_bugs|= FF_BUG_AC_VLC; s->workaround_bugs|= FF_BUG_AC_VLC;