[FFmpeg-cvslog] Merge commit '29dcde2b87559b72957454a7e9bcd5227d8057ba'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr 29 13:40:59 2015 +0200| [16b90d0bcbca75b48f5d6ba6555c185424cbc7e6] | committer: Michael Niedermayer

Merge commit '29dcde2b87559b72957454a7e9bcd5227d8057ba'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=16b90d0bcbca75b48f5d6ba6555c185424cbc7e6
---