Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 22:22:05 +0000 (00:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Apr 2014 22:42:47 +0000 (00:42 +0200)
commitb6850e132f36f5e467b949c36666787b4c2f1331
tree967500c7bc8ca946ede101e274a742d1e83a2de3
parent37af48717067a2080d7f8cf186011251b17c9529
parent9c21c08fa7c5d0c8391c8b6f47c61a8d4d9f040d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavfilter/af_ashowinfo.c