Mercurial > libavcodec.hg

changeset 7312:f9eaaadcd611 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplify
author michael
date Sat, 19 Jul 2008 03:13:11 +0000
parents b5dacf4fc65b
children 094536cc2e18
files h264.c
diffstat 1 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/h264.c	Sat Jul 19 02:54:54 2008 +0000
+++ b/h264.c	Sat Jul 19 03:13:11 2008 +0000
@@ -7855,9 +7855,6 @@
 
             out_of_order = !cross_idr && out->poc < h->outputed_poc;
 
-            if(pics <= s->avctx->has_b_frames || out_of_order)
-                out = NULL;
-
             if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
                 { }
             else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
@@ -7867,8 +7864,10 @@
             {
                 s->low_delay = 0;
                 s->avctx->has_b_frames++;
-                out= NULL;
-            }
+            }
+
+            if(pics <= s->avctx->has_b_frames || out_of_order)
+                out = NULL;
 
             if(out_of_order || pics > s->avctx->has_b_frames){
                 for(i=out_idx; h->delayed_pic[i]; i++)