[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr  5 00:22:05 2014 +0200| [b6850e132f36f5e467b949c36666787b4c2f1331] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6850e132f36f5e467b949c36666787b4c2f1331
---