Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Mar 2015 18:55:44 +0000 (19:55 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Mar 2015 19:15:40 +0000 (20:15 +0100)
commit50255b7a865f0dd4fecf8d1e337f96b92b4b406e
tree56c4827a3de1357eaca5704a17f1303795198269
parent60b9373dbd52bba91d2286d5f8a1366090a9df08
parent342fc46c69199b076b7c210f42208ce39a2bde1c
Merge commit '342fc46c69199b076b7c210f42208ce39a2bde1c'

* commit '342fc46c69199b076b7c210f42208ce39a2bde1c':
  cmdutils: Add a stream specifier to map usable streams

Conflicts:
cmdutils.c

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