FFmpeg/libavfilter
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-27 01:46:08 +01:00
2014-02-26 16:37:59 +00:00
2014-07-03 08:07:42 +00:00
2015-01-26 00:14:04 +01:00
2014-05-03 20:08:18 +02:00
2014-06-03 10:58:19 -08:00
2013-01-05 05:21:44 +01:00
2013-09-30 08:47:40 +00:00
2014-08-13 01:00:38 +02:00
2015-01-26 11:09:02 +01:00
2015-01-06 10:02:11 +00:00
2015-01-05 01:45:49 +01:00
2015-01-26 11:09:02 +01:00
2014-08-24 14:35:11 +02:00
2014-12-16 10:10:04 +00:00
2015-01-27 01:46:08 +01:00
2015-01-27 01:46:08 +01:00
2014-12-26 15:39:51 -03:00
2014-06-24 03:16:53 +02:00
2015-01-05 01:45:49 +01:00
2015-01-09 17:26:31 +01:00
2014-10-14 17:15:56 +02:00
2014-02-07 09:33:56 +01:00
2015-01-05 01:45:49 +01:00
2014-06-03 10:58:19 -08:00
2014-01-19 17:13:02 +01:00
2015-01-25 15:58:28 +01:00