1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
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
..
2014-04-07 01:31:02 +02:00
2014-04-07 01:31:02 +02:00
2014-08-05 01:54:47 +02:00
2015-01-02 21:24:02 +01:00
2014-12-19 14:35:29 +01:00
2014-12-19 14:35:29 +01:00
2014-08-13 14:50:15 +02:00
2014-07-12 22:33:27 +02:00
2014-07-12 22:33:27 +02:00
2014-04-01 17:36:33 +02:00
2014-04-29 13:24:11 +02:00
2015-01-05 01:45:49 +01:00
2014-11-08 11:31:11 +01:00
2014-08-18 22:37:03 +02:00
2014-10-11 12:15:26 +02:00
2014-06-03 10:58:19 -08:00
2014-09-05 00:43:48 +02:00
2015-01-12 13:49:56 -03:00
2014-08-05 21:05:52 +02:00
2014-01-19 17:12:22 +01:00
2014-05-26 11:40:15 +02:00
2014-05-26 11:40:15 +02:00
2014-05-28 03:25:41 +02:00
2014-08-05 01:54:47 +02:00
2013-11-22 17:16:11 +01:00
2014-04-07 01:31:36 +02:00
2014-04-07 01:31:36 +02:00