Merge commit 'c31f6b1d61759436ef50c094e7f4c8005e97614a'
authorJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:44:56 +0000 (20:44 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 13 Apr 2018 23:44:56 +0000 (20:44 -0300)
commit52b44e9d15c0ee3c118ed68a0c2c737a9eb50ae9
treecaf94b81d8960787b08a629421c05d9110315d0f
parent4339c94364f8ff143d051fcace3e5801625db607
parentc31f6b1d61759436ef50c094e7f4c8005e97614a
Merge commit 'c31f6b1d61759436ef50c094e7f4c8005e97614a'

* commit 'c31f6b1d61759436ef50c094e7f4c8005e97614a':
  avprobe: Print a user-friendly version of the display matrix
  avprobe: Support printing strings with empty keys

This commit is a noop. ffprobe is considerably different than avprobe
and is already printing display matrix values in a user readable way.

Merged-by: James Almer <jamrial@gmail.com>