har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h264dec: add forgotten copying of h->sync

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-18 19:02:37 +02:00
parent 0ddcfa42cc
commit ba5ff1b31e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/h264.c
View File

@ -1201,6 +1201,7 @@ static int decode_update_thread_context(AVCodecContext *dst, const AVCodecContex
copy_picture_range(h->delayed_pic, h1->delayed_pic, MAX_DELAYED_PIC_COUNT+2, s, s1); copy_picture_range(h->delayed_pic, h1->delayed_pic, MAX_DELAYED_PIC_COUNT+2, s, s1);
h->last_slice_type = h1->last_slice_type; h->last_slice_type = h1->last_slice_type;
h->sync = h1->sync;
if(!s->current_picture_ptr) return 0; if(!s->current_picture_ptr) return 0;
@ -1432,6 +1433,10 @@ static void decode_postinit(H264Context *h, int setup_finished){
av_log(s->avctx, AV_LOG_DEBUG, "no picture\n"); av_log(s->avctx, AV_LOG_DEBUG, "no picture\n");
} }
if (h->next_output_pic && h->next_output_pic->sync) {
h->sync |= 2*!!h->next_output_pic->f.key_frame;
}
if (setup_finished) if (setup_finished)
ff_thread_finish_setup(s->avctx); ff_thread_finish_setup(s->avctx);
} }
@ -3920,7 +3925,6 @@ static int decode_frame(AVCodecContext *avctx,
*data_size = 0; /* Wait for second field. */ *data_size = 0; /* Wait for second field. */
if (h->next_output_pic && h->next_output_pic->sync) { if (h->next_output_pic && h->next_output_pic->sync) {
h->sync |= 2*!!h->next_output_pic->f.key_frame;
if(h->sync>1 || h->next_output_pic->f.pict_type != AV_PICTURE_TYPE_B){ if(h->sync>1 || h->next_output_pic->f.pict_type != AV_PICTURE_TYPE_B){
*data_size = sizeof(AVFrame); *data_size = sizeof(AVFrame);
*pict = *(AVFrame*)h->next_output_pic; *pict = *(AVFrame*)h->next_output_pic;