[FFmpeg-cvslog] Merge commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Tue Oct 27 12:48:27 2015 +0100| [e7a57d4873e1123b9a42c4f8d7aefb4b1e8f1b61] | committer: Hendrik Leppkes

Merge commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa'

* commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa':
  libx264: Make sure the extradata are padded

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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