[FFmpeg-cvslog] Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed May  6 22:29:07 2015 +0200| [0318013afcffe0c3b8a0f0bf9f5f527098f6fa47] | committer: Michael Niedermayer

Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'

* commit '6c8c7c246280cdcd23e4d99006b95245ae837278':
  dump: Print AVAudioServiceType side data

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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