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)
* commit '1ec72c6c68dbc78bf4ebb6f06c13316dc488bdfa':
  libx264: Make sure the extradata are padded

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

Simple merge