diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 19:20:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 19:24:44 +0200 |
| commit | 1fd0e9a56d757a365492d3329ffe1c49e61d47f6 (patch) | |
| tree | af2b690e26c07ac42db0b391c8fcf08efa5db5f7 /libavutil/hmac.c | |
| parent | 3ac51145304f9996152a80f5a191ced7b857a252 (diff) | |
| parent | 5dd8c08fd5e4c04d7a08d8934f0098a8a4a35c28 (diff) | |
| download | ffmpeg-1fd0e9a56d757a365492d3329ffe1c49e61d47f6.tar.gz | |
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>
Diffstat (limited to 'libavutil/hmac.c')
0 files changed, 0 insertions, 0 deletions