virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '29dcde2b87559b72957454a7e9bcd5227d8057ba'

Browse Source 
* commit '29dcde2b87559b72957454a7e9bcd5227d8057ba':
  h264: copy nal_length_size in update_thread_context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-04-29 13:40:59 +02:00
parent 1aa3a0f457 29dcde2b87
commit 16b90d0bcb
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/h264_slice.c
View File

@@ -555,6 +555,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst,
// extradata/NAL handling // extradata/NAL handling
h->is_avc = h1->is_avc; h->is_avc = h1->is_avc;
h->nal_length_size = h1->nal_length_size;
// SPS/PPS // SPS/PPS
if ((ret = copy_parameter_set((void **)h->sps_buffers, if ((ret = copy_parameter_set((void **)h->sps_buffers,