Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 13:16:00 +0000 (14:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 13:21:27 +0000 (14:21 +0100)
commitbb6de15d927dcbc5175387fdbb2c066243c1c6b4
tree3a0140505a6493f69b5d0dcb7cd473374ae45613
parent7d7487e85c066bf3f4e5821a49081f520b6bc1e7
parent81498ceb5b2d1f72a3fd694849b1feaffc301e56
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: Match stream id

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

See: ea07063fd82686af3fabb45e5ed10aa48d084d61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/fftools-common-opts.texi
libavformat/utils.c