diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:59:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-03 02:59:19 +0100 |
| commit | b452c8a722b7d145f0a4396d26d609aad3feeccd (patch) | |
| tree | 8dfa4610689e4c7442abca36088d0d194d749d9d /tests/ffserver.conf | |
| parent | 7711f19eda40a7fd1c8a327f1700ffdd115e1667 (diff) | |
| parent | eebc40e17784ced5ce297fb3e0a6caa7b9ee2433 (diff) | |
| download | ffmpeg-b452c8a722b7d145f0a4396d26d609aad3feeccd.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: fft: Fix libavcodec dependency
build: Make the ISMV muxer select the MOV muxer
configure: move arm arch extensions to a separate variable
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions