Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 17:20:12 +0000 (19:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 27 Jun 2014 17:24:44 +0000 (19:24 +0200)
commit1fd0e9a56d757a365492d3329ffe1c49e61d47f6
treeaf2b690e26c07ac42db0b391c8fcf08efa5db5f7
parent3ac51145304f9996152a80f5a191ced7b857a252
parent5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28
Merge commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28'

* commit '5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28':
  mpeg: Change ff_convert_matrix() to take an MpegEncContext parameter

Conflicts:
libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dnxhdenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c