diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-11-25 19:42:16 +0100 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-11-27 12:26:33 +0100 |
| commit | d5e83122bdc39b9c0278b9b4f6c49baa99223bd6 (patch) | |
| tree | 05d9c28c33b90ba514ff5f916e3bc942c2d7e457 | |
| parent | 6e5cdf26281945ddea3aaf5eca4d127791f23ca8 (diff) | |
| download | ffmpeg-d5e83122bdc39b9c0278b9b4f6c49baa99223bd6.tar.gz | |
h264: set Picture.owner2 to the current thread
This does not seem to have an effect currently. Fate-h264 passes with
THREADS=1..16 and both threading types as before. It fixes however a
segfault during error resilience with my adaptive-frame-mt patchset.
A picture in use during error resilience gets realloced in another
thread in the fuzzed sample sample_varPAR.avi_s226019.
| -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 8226d74326..8b9ac5c232 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2876,10 +2876,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 8a48d9937a..322ad098e8 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1459,8 +1459,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) |