diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 04:46:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 05:15:40 +0100 |
| commit | 31c4a1b7d0a052f9717185900e01c2500b55e51b (patch) | |
| tree | b53017d8246ad9588cbfa16b16b59c7937109087 /libavcodec | |
| parent | 2c85d7c015489e169759e52c21499579dae5c2b1 (diff) | |
| download | ffmpeg-31c4a1b7d0a052f9717185900e01c2500b55e51b.tar.gz | |
h264: do not mess up cur_chroma_format_idc during thread update
Fixes out of array reads
Regression probably since allowing pixel format changes or a related commit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d5f4760b0c..3dcf00a357 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1224,6 +1224,7 @@ static int decode_update_thread_context(AVCodecContext *dst, /* copy block_offset since frame_start may not be called */ memcpy(h->block_offset, h1->block_offset, sizeof(h->block_offset)); h264_set_parameter_from_sps(h); + h->cur_chroma_format_idc = h1->cur_chroma_format_idc; } err = ff_mpeg_update_thread_context(dst, src); |