1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
..
2012-10-08 02:09:28 +02:00
2012-11-09 21:05:43 +01:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-11-04 17:37:28 +01:00
2012-11-07 13:03:50 +00:00
2012-10-09 04:00:55 +02:00
2012-08-15 22:32:06 +03:00
2012-09-21 01:03:31 +02:00
2012-10-29 21:13:50 +01:00
2012-10-20 15:33:44 +02:00
2012-10-19 00:08:01 +00:00
2012-11-05 20:47:13 +00:00
2012-05-18 23:34:11 +02:00
2012-10-29 20:06:52 +00:00
2012-10-14 05:48:02 +02:00
2012-10-18 20:29:03 +02:00
2012-09-04 18:37:54 +03:00
2012-10-12 17:58:15 +02:00
2012-08-15 22:32:06 +03:00
2012-09-07 12:36:00 +02:00
2012-07-19 18:44:46 +02:00
2012-10-25 21:51:45 +00:00
2012-11-07 18:08:23 +01:00
2012-10-09 16:48:43 +02:00
2012-06-07 21:07:17 +02:00
2012-10-21 18:22:50 +02:00
2012-10-21 18:22:50 +02:00
2012-07-10 02:17:52 +02:00
2012-11-09 21:06:01 +01:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-05-18 23:34:11 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-04-22 22:26:55 +02:00
2012-10-19 00:08:01 +00:00
2012-07-22 05:18:01 +02:00
2012-11-07 01:51:24 +01:00
2012-10-19 00:08:02 +00:00
2012-05-18 23:34:11 +02:00
2012-09-03 23:26:14 +02:00
2012-10-18 21:42:04 +02:00
2012-11-11 01:19:44 +01:00
2012-10-12 01:44:35 +02:00
2012-11-12 01:43:11 +01:00
2012-11-02 22:27:17 +01:00
2012-10-14 21:45:42 +02:00
2012-07-05 02:54:34 +00:00
2012-11-09 21:06:01 +01:00
2012-10-13 08:22:26 +00:00
2012-06-29 20:43:30 +02:00
2012-10-13 16:02:09 +00:00
2012-11-04 23:35:09 +00:00
2012-06-29 20:43:30 +02:00
2012-07-29 22:02:46 +02:00
2012-09-10 21:04:01 +02:00
2012-10-25 01:38:15 +02:00
2012-06-21 01:30:16 +00:00
2012-10-29 20:06:52 +00:00
2012-11-11 19:02:31 +01:00
2012-09-18 17:37:41 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-11-09 19:28:57 +01:00
2012-10-12 18:17:10 +03:00
2012-10-10 16:48:13 +00:00
2012-10-27 04:32:40 +02:00
2012-09-23 15:24:08 +02:00
2012-06-29 20:43:30 +02:00
2012-10-13 18:00:48 +00:00
2012-10-15 13:28:23 +00:00