diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 05:12:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-24 05:12:07 +0100 |
| commit | f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7 (patch) | |
| tree | 46cf8165c145f437a19140a22ddf7f1d0a80cefc /libavfilter | |
| parent | ceaaf0d97e7fc11b850325201cf30d7b83e80fd2 (diff) | |
| parent | 0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85 (diff) | |
| download | ffmpeg-streaming-f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7.zip ffmpeg-streaming-f67ec7f3a2698f28c17aab4bb40c9a3d9f1289f7.tar.gz | |
Merge commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85'
* commit '0eeeb9647e9c92c9edfd0b18c7cb5da7ac666f85':
mpegaudiodec: Consistently handle fixed/float templating
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions
