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)
* qatar/master:
  af_ashowinfo: print a more descriptive name for AV_MATRIX_ENCODING_DOLBY

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

Simple merge