Merge commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 11:48:27 +0000 (12:48 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 27 Oct 2015 11:48:27 +0000 (12:48 +0100)
commite7a57d4873e1123b9a42c4f8d7aefb4b1e8f1b61
tree7180c6fa334c42e4c5bc921f9d1e1a1aad4f1d1c
parent368e5216464fd894ded93e8a3fc12066c1a9c061
parent1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa
Merge commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libx264.c