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)
commit0318013afcffe0c3b8a0f0bf9f5f527098f6fa47
tree19161b4c6a472b9d332e79a3a517b50af7eadd7b
parent1caff5731d9a9f98de9e50569bac0d2d487e9e53
parent6c8c7c246280cdcd23e4d99006b95245ae837278
Merge commit '6c8c7c246280cdcd23e4d99006b95245ae837278'

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

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