Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 20:29:07 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 6 May 2015 20:29:19 +0000 (22:29 +0200)
* commit '6c8c7c246280cdcd23e4d99006b95245ae837278':
  dump: Print AVAudioServiceType side data

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

Simple merge