Michael Niedermayer bb6de15d92 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  avconv: Match stream id

Conflicts:
	cmdutils.c
	doc/fftools-common-opts.texi

See: ea07063fd8
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-13 14:21:27 +01:00

156 KiB

Raw Blame History

View Raw