[FFmpeg-cvslog] Merge commit '7d308bf84bda78d47c01439ff625bb06624991a7'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 27 22:30:23 2017 +0200| [c7a5b40dd97ff9533634699feef803295c9cb956] | committer: Clément Bœsch

Merge commit '7d308bf84bda78d47c01439ff625bb06624991a7'

* commit '7d308bf84bda78d47c01439ff625bb06624991a7':
  avprobe: Add -show_stream_entry to get a single stream property

This commit is a noop, we have a generic -show_entry option.

Merged-by: Clément Bœsch <u at pkh.me>

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