mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
10l (compile fix)
Originally committed as revision 4032 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
b2866c5cb5
commit
0149db6668
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user