Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 22:43:40 +0000 (23:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 8 Mar 2015 22:58:18 +0000 (23:58 +0100)
commitfa14685a578d4d37f9a53c2399bba7770e48f747
tree7b748d69f420ba6b2fd8a62433b194addf60d1ad
parentd5e9fc782150d4596c72440a0aa02b7f4f1254b1
parent7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f
Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

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

Conflicts:
avprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/ffprobe.xsd
ffprobe.c
tests/ref/fate/ffprobe_compact
tests/ref/fate/ffprobe_csv
tests/ref/fate/ffprobe_default
tests/ref/fate/ffprobe_flat
tests/ref/fate/ffprobe_ini
tests/ref/fate/ffprobe_json
tests/ref/fate/ffprobe_xml