diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:55:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 10:55:43 +0200 |
| commit | 1ba4cbf734b343f82e0ae4ab6be3756249771afa (patch) | |
| tree | ca0ea2cbd00fba018cb3c713c278796ca31a5d2c /libavcodec/x86/mpegvideo.c | |
| parent | 05599308e98895e3c9aa6c1c90a2086aa029c42e (diff) | |
| parent | 6b753015ca6f93d16a05e1a97da1fa42e4da60ec (diff) | |
| download | ffmpeg-1ba4cbf734b343f82e0ae4ab6be3756249771afa.tar.gz | |
Merge commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec'
* commit '6b753015ca6f93d16a05e1a97da1fa42e4da60ec':
aac: Remove aacpsy.h header, unused since 78e65cd7726
cavs: Remove cavsdata.h header, unused since 88386feefd
Conflicts:
libavcodec/aacpsy.h
libavcodec/cavsdata.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/mpegvideo.c')
0 files changed, 0 insertions, 0 deletions