Mercurial > libavcodec.hg

changeset 3287:1eaa95d9e999 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
d10 decoding fix
author michael
date Tue, 02 May 2006 09:03:22 +0000
parents 30d412952107
children 95f50b66e0b1
files mpeg12.c
diffstat 1 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mpeg12.c	Mon May 01 00:28:36 2006 +0000
+++ b/mpeg12.c	Tue May 02 09:03:22 2006 +0000
@@ -2618,10 +2618,13 @@
 
             if(s->mb_y<<field_pic >= s->mb_height){
                 int left= s->gb.size_in_bits - get_bits_count(&s->gb);
-
-                if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)))
+                int is_d10= s->chroma_format==2 && s->pict_type==I_TYPE && avctx->profile==0 && avctx->level==5
+                            && s->intra_dc_precision == 2 && s->q_scale_type == 1 && s->alternate_scan == 0
+                            && s->progressive_frame == 0 /* vbv_delay == 0xBBB || 0xE10*/;
+
+                if(left < 0 || (left && show_bits(&s->gb, FFMIN(left, 23)) && !is_d10)
                    || (avctx->error_resilience >= FF_ER_AGGRESSIVE && left>8)){
-                    av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d\n", left);
+                    av_log(avctx, AV_LOG_ERROR, "end mismatch left=%d %0X\n", left, show_bits(&s->gb, FFMIN(left, 23)));
                     return -1;
                 }else
                     goto eos;