diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 13:40:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-29 13:41:24 +0200 |
| commit | 16b90d0bcbca75b48f5d6ba6555c185424cbc7e6 (patch) | |
| tree | 010351301fd8ecc71d029ecd929a1d181352fb87 | |
| parent | 1aa3a0f457c3d33e01fa0df17e19eb1100e51f3b (diff) | |
| parent | 29dcde2b87559b72957454a7e9bcd5227d8057ba (diff) | |
| download | ffmpeg-16b90d0bcbca75b48f5d6ba6555c185424cbc7e6.tar.gz | |
Merge commit '29dcde2b87559b72957454a7e9bcd5227d8057ba'
* commit '29dcde2b87559b72957454a7e9bcd5227d8057ba':
h264: copy nal_length_size in update_thread_context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 24f5bd43d6..9a41b8c0bf 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -555,6 +555,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, // extradata/NAL handling h->is_avc = h1->is_avc; + h->nal_length_size = h1->nal_length_size; // SPS/PPS if ((ret = copy_parameter_set((void **)h->sps_buffers, |