1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
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
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-01-07 17:17:33 -09:00
2015-01-07 17:17:33 -09:00
2015-01-26 11:09:02 +01:00
2014-12-01 00:31:06 +01:00
2015-01-12 09:32:06 -09:00
2015-01-07 17:17:33 -09:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2014-11-22 02:09:09 +01:00
2014-12-06 02:48:17 +01:00
2014-07-17 11:29:01 +02:00