ffprobe: add more "-show_" short options
Merge branch 'master' of git://github.com/FFmpeg/FFmpeg