[SCM] libav/experimental: 10l (compile fix)

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 0149db666854b9bb2e640c5e929289f9c4b821f3
Author: Loren Merritt <lorenm at u.washington.edu>
Date:   Sat Mar 12 03:10:44 2005 +0000

    10l (compile fix)
    
    Originally committed as revision 4032 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 0ceb758..7bf419f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -6536,10 +6536,10 @@ static int decode_frame(AVCodecContext *avctx,
     }
 
     {
-//#define DECODE_ORDER
         Picture *out = s->current_picture_ptr;
+#if 0 //decode order
         *data_size = sizeof(AVFrame);
-#ifndef DECODE_ORDER
+#else
         /* Sort B-frames into display order */
         Picture *cur = s->current_picture_ptr;
         Picture *prev = h->delayed_output_pic;
@@ -6595,6 +6595,8 @@ static int decode_frame(AVCodecContext *avctx,
 
         if(prev == out && !dropped_frame)
             *data_size = 0;
+        else
+            *data_size = sizeof(AVFrame);
         if(prev && prev != out && prev->reference == 1)
             prev->reference = 0;
         h->delayed_output_pic = out;

-- 
Libav/FFmpeg packaging