[FFmpeg-cvslog] Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  6 01:52:41 2013 +0100| [16338b4fb961acc9e6a21586987266ff9862545d] | committer: Michael Niedermayer

Merge commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a'

* commit '2cab011f0f02fcff8a0629a611bcac2f0459f04a':
  mpegvideo: don't copy input_picture_number in update_thread_context()

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

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