diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 11:56:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-21 11:56:29 +0100 |
| commit | 6c8ac2d78230990f3a01be28d3ef68fb281d6609 (patch) | |
| tree | 9844728ecb492e32ff03026b64501b42213c0559 /libavcodec | |
| parent | 82f95d7fd7c0e99a59163e6d14c35cc11bb7f9d7 (diff) | |
| parent | 1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5 (diff) | |
| download | ffmpeg-6c8ac2d78230990f3a01be28d3ef68fb281d6609.tar.gz | |
Merge commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5'
* commit '1c4073efd24164ac6eaa52c544f5cdb0e5f6aee5':
fate: add tests for h264 decoder reinit
h264: fix bit depth changes with frame threading
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index bb866b696e..3c4f5095b1 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1628,6 +1628,11 @@ static int decode_update_thread_context(AVCodecContext *dst, h->sps.chroma_format_idc != h1->sps.chroma_format_idc || h->sps.colorspace != h1->sps.colorspace)) { + /* set bits_per_raw_sample to the previous value. the check for changed + * bit depth in h264_set_parameter_from_sps() uses it and sets it to + * the current value */ + h->avctx->bits_per_raw_sample = h->sps.bit_depth_luma; + av_freep(&h->bipred_scratchpad); h->width = h1->width; |