[SCM] libav/experimental: simplify

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0ab515e9353181d8fe7eb42cf6123dcb06c47edf
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Jul 19 03:13:11 2008 +0000

    simplify
    
    Originally committed as revision 14291 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 02f71d5..725dc33 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7855,9 +7855,6 @@ static int decode_frame(AVCodecContext *avctx,
 
             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,9 +7864,11 @@ static int decode_frame(AVCodecContext *avctx,
             {
                 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++)
                     h->delayed_pic[i] = h->delayed_pic[i+1];

-- 
Libav/FFmpeg packaging