Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:32:19 +0000 (18:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:32:23 +0000 (18:32 +0100)
commit6d34665c76cabc1d96dccb7912ff61021aa1eef3
tree8a3918efda82c8b2fed3d97308e3b440162eb95f
parent0bdcc27d9598254e79a80f1e016227778b428dbb
parent32125781487411ed3b1b28b32063d6cd4024d4fc
Merge commit '32125781487411ed3b1b28b32063d6cd4024d4fc'

* commit '32125781487411ed3b1b28b32063d6cd4024d4fc':
  mov: export audio service type as side data

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