diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:36:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-27 14:36:53 +0100 |
| commit | 4063bb212e18a0dac17133905526b09b4fab5415 (patch) | |
| tree | 549369cc63728d0c786b8926928ee4e060cb3418 /libavcodec | |
| parent | 577b39aea221ddc9606f3b5ca698516155cdfd43 (diff) | |
| parent | d5e83122bdc39b9c0278b9b4f6c49baa99223bd6 (diff) | |
| download | ffmpeg-4063bb212e18a0dac17133905526b09b4fab5415.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: set Picture.owner2 to the current thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 094333d9fd..33803bfe86 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2962,10 +2962,12 @@ static int decode_slice_header(H264Context *h, H264Context *h0) if (h->slice_type_nos != AV_PICTURE_TYPE_I) { s->last_picture_ptr = &h->ref_list[0][0]; + s->last_picture_ptr->owner2 = s; ff_copy_picture(&s->last_picture, s->last_picture_ptr); } if (h->slice_type_nos == AV_PICTURE_TYPE_B) { s->next_picture_ptr = &h->ref_list[1][0]; + s->next_picture_ptr->owner2 = s; ff_copy_picture(&s->next_picture, s->next_picture_ptr); } diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 885226ac61..8a308bea68 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1456,8 +1456,7 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx) if (s->next_picture_ptr) ff_copy_picture(&s->next_picture, s->next_picture_ptr); - if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME) && - (s->out_format != FMT_H264 || s->codec_id == AV_CODEC_ID_SVQ3)) { + if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) { if (s->next_picture_ptr) s->next_picture_ptr->owner2 = s; if (s->last_picture_ptr) |