[FFmpeg-cvslog] Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 18:49:50 2015 +0100| [4ce67c961c0ff25580c922b6b1906012b8bcb329] | committer: Michael Niedermayer

Merge commit 'a536a4e4bc52d05f59869761337452fb1f1977f6'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ce67c961c0ff25580c922b6b1906012b8bcb329
---