diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-12 23:53:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-12 23:57:00 +0200 |
| commit | 620c6292b1a7cdaaa3e258c899b37e68954589b8 (patch) | |
| tree | cce4c5fcb0a86343dcbb30c116e0b54dc6122309 /libavformat/voc.c | |
| parent | f9c823df13f47d285ed0bd406906e138df4e8ae1 (diff) | |
| parent | 0da29727eadcc4e1f1ed661d1db4caed6ceb17c9 (diff) | |
| download | ffmpeg-620c6292b1a7cdaaa3e258c899b37e68954589b8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Fix Ogg demuxer dependencies
build: Fix FLAC demuxer dependencies
flac: Move flac functions shared between libraries to flac common code
build: Fix CAF demuxer dependencies
build: Fix MP2 muxer dependencies
build: Add missing build rules for the ISMV muxer
configure: Drop redundant mxf_d10 test dependency declaration
Support AAC encoding via the external library fdk-aac
libavcodec: Add more AAC profiles
dct/fft-test: use a replacement getopt() if the system has none present.
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/voc.c')
0 files changed, 0 insertions, 0 deletions