[FFmpeg-cvslog] Merge commit '728685f37ab333ca35980bd01766c78d197f784a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 27 18:02:42 2015 +0100| [62a82c66cd3f03e045867471c5edcc84b4d2b54e] | committer: Michael Niedermayer

Merge commit '728685f37ab333ca35980bd01766c78d197f784a'

* commit '728685f37ab333ca35980bd01766c78d197f784a':
  Add a side data type for audio service type.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h
	libavutil/frame.h
	libavutil/version.h

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

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