Mercurial > libavcodec.hg

changeset 3297:9ae9653d706c libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
decoders should (IMHO) not duplicate frames, the application can do this if it wants
author michael
date Wed, 10 May 2006 10:57:27 +0000
parents d185908c71cb
children 9637da0a9c1b
files h264.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Tue May 09 08:40:38 2006 +0000
+++ b/h264.c	Wed May 10 10:57:27 2006 +0000
@@ -6900,7 +6900,7 @@
             eos = get_cabac_terminate( &h->cabac );
 
             if( ret < 0 || h->cabac.bytestream > h->cabac.bytestream_end + 1) {
-                av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d\n", s->mb_x, s->mb_y);
+                av_log(h->s.avctx, AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%d)\n", s->mb_x, s->mb_y, h->cabac.bytestream_end - h->cabac.bytestream);
                 ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x, s->mb_y, (AC_ERROR|DC_ERROR|MV_ERROR)&part_mask);
                 return -1;
             }
@@ -7786,7 +7786,6 @@
         int pics = 0;
         int out_of_order;
         int cross_idr = 0;
-        int dropped_frame = 0;
         int i;
 
         if(h->sps.bitstream_restriction_flag
@@ -7829,12 +7828,11 @@
             out = prev;
 
         if(out_of_order || pics > s->avctx->has_b_frames){
-            dropped_frame = (out != h->delayed_pic[out_idx]);
             for(i=out_idx; h->delayed_pic[i]; i++)
                 h->delayed_pic[i] = h->delayed_pic[i+1];
         }
 
-        if(prev == out && !dropped_frame)
+        if(prev == out)
             *data_size = 0;
         else
             *data_size = sizeof(AVFrame);