diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 20:35:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 20:35:43 +0200 |
| commit | 5a1aa559054b197b64453c60dd01bc5c37532ff9 (patch) | |
| tree | 0637dbfbde146258ebacdfa0b2c7aadbe24ec856 /libavformat/swf.h | |
| parent | 242f8bb3a8a11a54266f43ad45a5a4a260dcbe7f (diff) | |
| parent | b01a2204b5cff7bb920f42fda1bb0103f450fe93 (diff) | |
| download | ffmpeg-5a1aa559054b197b64453c60dd01bc5c37532ff9.tar.gz | |
Merge commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93'
* commit 'b01a2204b5cff7bb920f42fda1bb0103f450fe93':
libfdk-aacdec: Enable Decoder Downmix including Downmix Metadata Support
Conflicts:
libavcodec/libfdk-aacdec.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/swf.h')
0 files changed, 0 insertions, 0 deletions