Michael Niedermayer 62a82c66cd 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@gmx.at>

2015-01-27 18:03:43 +01:00

86 KiB

Raw Blame History

View Raw