[FFmpeg-cvslog] Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 22:04:29 2013 +0100| [2c9fc694f50a01c10448b4ed08b4d6adcfaaa3a7] | committer: Michael Niedermayer

Merge commit '09cb75cdeba420d680bcb165a1ef668d8f381fed'

* commit '09cb75cdeba420d680bcb165a1ef668d8f381fed':
  libx264: set frame packing information when relevant information is found

Conflicts:
	libavcodec/libx264.c

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

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