Mercurial > libavcodec.hg

changeset 921:f633377858b6 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ump4 decoding fixed
author michaelni
date Sat, 07 Dec 2002 11:38:26 +0000
parents a0ad8e3452f2
children 5fa4d5007dfd
files h263.c h263dec.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/h263.c	Fri Dec 06 17:58:21 2002 +0000
+++ b/h263.c	Sat Dec 07 11:38:26 2002 +0000
@@ -3624,7 +3624,7 @@
 #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");
--- a/h263dec.c	Fri Dec 06 17:58:21 2002 +0000
+++ b/h263dec.c	Sat Dec 07 11:38:26 2002 +0000
@@ -442,13 +442,13 @@
     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;