[FFmpeg-cvslog] Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  8 23:43:40 2015 +0100| [fa14685a578d4d37f9a53c2399bba7770e48f747] | committer: Michael Niedermayer

Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
  avprobe: Export coded_{width,height} in -show_streams

Conflicts:
	avprobe.c

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

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