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)
* commit '32125781487411ed3b1b28b32063d6cd4024d4fc':
  mov: export audio service type as side data

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

Simple merge