diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 23:23:11 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-16 23:23:16 +0200 |
commit | 0ea97a1c5b4510d276db105a1bb1766ef535e488 (patch) | |
tree | f4c43afb1778b72de565d1815a40e6fa88bc1aa7 /MAINTAINERS | |
parent | c1fe41ed472e66e6198bbdaf4faf6fa10f7b79c4 (diff) | |
parent | 7f1fd9763668c5863e743d108f501a00d1806da0 (diff) | |
download | ffmpeg-0ea97a1c5b4510d276db105a1bb1766ef535e488.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
cmdutils: Fix build with lavfi disabled
flvenc: do not mux more than one stream per type
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions