Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:49:50 +0000 (18:49 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 17:50:47 +0000 (18:50 +0100)
commit4ce67c961c0ff25580c922b6b1906012b8bcb329
treec895deb2ca977448d09cd882f38b666cf85cf73a
parent6d34665c76cabc1d96dccb7912ff61021aa1eef3
parenta536a4e4bc52d05f59869761337452fb1f1977f6
Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'

* commit 'a536a4e4bc52d05f59869761337452fb1f1977f6':
  lavc: support extracting audio service type from side data

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c