[FFmpeg-cvslog] Merge commit '481a3667495425db9fdffb653292b6460fb68208'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 14 00:41:08 2014 +0200| [b8e4c11d93326cd86278d012c28e54dca0a06cef] | committer: Michael Niedermayer

Merge commit '481a3667495425db9fdffb653292b6460fb68208'

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

Conflicts:
	Changelog
	cmdutils.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b8e4c11d93326cd86278d012c28e54dca0a06cef
---