virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

10l (compile fix)

Browse Source 
Originally committed as revision 4032 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Loren Merritt 2005-03-12 03:10:44 +00:00
parent b2866c5cb5
commit 0149db6668
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@ -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;