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

Conflicts:
	avprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>