diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-16 23:32:27 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-21 03:50:53 +0200 |
| commit | d0de80ee44ae6b041776e82b502a8071b5584bdf (patch) | |
| tree | d9086d692e411dba6bee0a4ea8a5a126b1c897ae | |
| parent | 02ad827226fcf7fd22793acc0a49ed17f099f1ef (diff) | |
| download | ffmpeg-d0de80ee44ae6b041776e82b502a8071b5584bdf.tar.gz | |
avcodec/mpeg4videodec: Keep data_partitioning in sync between threads
Fixes frame-threaded decoding of samples created by concatting
a video with data partitioning and a video not using it.
(Only the MPEG-4 decoder sets this, so it is synced in
mpeg4_update_thread_context() despite being a MpegEncContext-field.)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/mpeg4videodec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index bfebc3806c..d89adf8d63 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -3534,6 +3534,7 @@ static int mpeg4_update_thread_context(AVCodecContext *dst, s->vol_sprite_usage = s1->vol_sprite_usage; s->sprite_brightness_change = s1->sprite_brightness_change; s->num_sprite_warping_points = s1->num_sprite_warping_points; + s->m.data_partitioning = s1->m.data_partitioning; s->rvlc = s1->rvlc; s->resync_marker = s1->resync_marker; s->t_frame = s1->t_frame; |