Merge commit '29dcde2b87559b72957454a7e9bcd5227d8057ba'

* commit '29dcde2b87559b72957454a7e9bcd5227d8057ba': h264: copy nal_length_size in update_thread_context Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 16b90d0bcb
parent 1aa3a0f457 29dcde2b87
commit 16b90d0bcb
1 changed files with 1 additions and 0 deletions
--- 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,