Commit 0149db66 authored by Loren Merritt's avatar Loren Merritt

10l (compile fix)

Originally committed as revision 4032 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b2866c5c
...@@ -6536,10 +6536,10 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -6536,10 +6536,10 @@ static int decode_frame(AVCodecContext *avctx,
} }
{ {
//#define DECODE_ORDER
Picture *out = s->current_picture_ptr; Picture *out = s->current_picture_ptr;
#if 0 //decode order
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
#ifndef DECODE_ORDER #else
/* Sort B-frames into display order */ /* Sort B-frames into display order */
Picture *cur = s->current_picture_ptr; Picture *cur = s->current_picture_ptr;
Picture *prev = h->delayed_output_pic; Picture *prev = h->delayed_output_pic;
...@@ -6595,6 +6595,8 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -6595,6 +6595,8 @@ static int decode_frame(AVCodecContext *avctx,
if(prev == out && !dropped_frame) if(prev == out && !dropped_frame)
*data_size = 0; *data_size = 0;
else
*data_size = sizeof(AVFrame);
if(prev && prev != out && prev->reference == 1) if(prev && prev != out && prev->reference == 1)
prev->reference = 0; prev->reference = 0;
h->delayed_output_pic = out; h->delayed_output_pic = out;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment