Michael Niedermayer 0ea97a1c5b 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>

2013-04-16 23:23:16 +02:00

21 KiB

Raw Blame History

View Raw