Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Apr 2013 21:23:11 +0000 (23:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 16 Apr 2013 21:23:16 +0000 (23:23 +0200)
commit0ea97a1c5b4510d276db105a1bb1766ef535e488
treef4c43afb1778b72de565d1815a40e6fa88bc1aa7
parentc1fe41ed472e66e6198bbdaf4faf6fa10f7b79c4
parent7f1fd9763668c5863e743d108f501a00d1806da0
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>
cmdutils.c
libavformat/flvenc.c