Merge commit '481a3667495425db9fdffb653292b6460fb68208'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:41:08 +0000 (00:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Aug 2014 22:41:21 +0000 (00:41 +0200)
commitb8e4c11d93326cd86278d012c28e54dca0a06cef
tree96ed0fc1c7d5db348b532dd993710430290585a1
parentc8571c61ec4c352e7eac7147b7c1644d2406189e
parent481a3667495425db9fdffb653292b6460fb68208
Merge commit '481a3667495425db9fdffb653292b6460fb68208'

* commit '481a3667495425db9fdffb653292b6460fb68208':
  cmdutils: allow matching by metadata in stream specifiers

Conflicts:
Changelog
cmdutils.c

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