From 0149db666854b9bb2e640c5e929289f9c4b821f3 Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Sat, 12 Mar 2005 03:10:44 +0000 Subject: [PATCH] 10l (compile fix) Originally committed as revision 4032 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 0ceb75827a..7bf419f999 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;