diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:20:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:20:54 +0200 |
| commit | e18d9d90f1d30feed02a0d973ee1c0e46f6abfd7 (patch) | |
| tree | 3b00c61d68c0c45d1bdf044a05947f2f7a2d69a7 /libavcodec/adx.h | |
| parent | a71fcfad892c4c59a011556f70b998aca1139b37 (diff) | |
| parent | 8c6f430291374cf6d2cfb85cdbb809803b5a7d83 (diff) | |
| download | ffmpeg-e18d9d90f1d30feed02a0d973ee1c0e46f6abfd7.tar.gz | |
Merge commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83'
* commit '8c6f430291374cf6d2cfb85cdbb809803b5a7d83':
mpeg: Suppress a compiler warning on callback type
Conflicts:
libavformat/mpegenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/adx.h')
0 files changed, 0 insertions, 0 deletions