Skip to content
Browse files

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: set Picture.owner2 to the current thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information...
2 parents 577b39a + d5e8312 commit 4063bb212e18a0dac17133905526b09b4fab5415 @michaelni michaelni committed Nov 27, 2012
Showing with 3 additions and 2 deletions.
  1. +2 −0 libavcodec/h264.c
  2. +1 −2 libavcodec/mpegvideo.c
View
2 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);
}
View
3 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)

0 comments on commit 4063bb2

Please sign in to comment.
Something went wrong with that request. Please try again.