Michael Niedermayer
1cbf7fb434
Merge remote-tracking branch 'qatar/master' ...
* qatar/master: (26 commits)
fate: use diff -b in oneline comparison
Add missing version bumps and APIchanges/Changelog entries.
lavfi: move buffer management function to a separate file.
lavfi: move formats-related functions from default.c to formats.c
lavfi: move video-related functions to a separate file.
fate: make smjpeg a demux test
fate: separate sierra-vmd audio and video tests
fate: separate smacker audio and video tests
libmp3lame: set supported channel layouts.
avconv: automatically insert asyncts when -async is used.
avconv: add support for audio filters.
lavfi: add asyncts filter.
lavfi: add aformat filter
lavfi: add an audio buffer sink.
lavfi: add an audio buffer source.
buffersrc: add av_buffersrc_write_frame().
buffersrc: fix invalid read in uninit if the fifo hasn't been allocated
lavfi: rename vsrc_buffer.c to buffersrc.c
avfiltergraph: reindent
lavfi: add channel layout/sample rate negotiation.
...
Conflicts:
Changelog
doc/APIchanges
doc/filters.texi
ffmpeg.c
ffprobe.c
libavcodec/libmp3lame.c
libavfilter/Makefile
libavfilter/af_aformat.c
libavfilter/allfilters.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
libavfilter/defaults.c
libavfilter/formats.c
libavfilter/src_buffer.c
libavfilter/version.h
libavfilter/vf_yadif.c
libavfilter/vsrc_buffer.c
libavfilter/vsrc_buffer.h
libavutil/avutil.h
tests/fate/audio.mak
tests/fate/demux.mak
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-16 02:27:31 +02:00
2012-04-22 22:26:55 +02:00
2012-05-11 20:57:39 +02:00
2012-03-26 20:52:52 +02:00
2012-04-13 00:39:19 +02:00
2012-05-01 22:06:55 +02:00
2012-03-26 20:52:52 +02:00
2012-04-13 00:39:19 +02:00
2012-05-14 20:17:24 +02:00
2012-04-29 21:45:54 +02:00
2012-04-18 00:28:06 +02:00
2012-04-17 10:25:28 -04:00
2012-05-07 18:56:06 +02:00
2012-04-18 00:28:06 +02:00
2012-05-06 21:53:19 +02:00
2012-05-06 21:53:19 +02:00
2012-05-06 21:53:19 +02:00
2012-05-06 21:53:19 +02:00
2012-05-05 22:04:21 +01:00
2012-05-05 22:04:21 +01:00
2012-03-29 04:11:10 +02:00
2012-04-18 00:28:06 +02:00
2012-05-08 16:53:03 +02:00
2012-04-20 17:52:33 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-06 22:52:01 +02:00
2012-05-01 22:06:55 +02:00
2012-04-07 22:41:37 +02:00
2012-04-16 02:18:10 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 19:24:32 +02:00
2012-05-05 13:19:35 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 23:30:42 +02:00
2012-05-15 02:31:52 +02:00
2012-04-22 12:16:29 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-15 02:31:28 +02:00
2012-05-08 00:25:25 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 02:25:41 +02:00
2012-04-10 22:53:25 +02:00
2012-04-13 00:39:19 +02:00
2012-04-20 17:42:18 +02:00
2012-05-08 08:41:26 +02:00
2012-04-07 22:41:37 +02:00
2012-04-13 00:39:19 +02:00
2012-04-13 00:39:19 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-13 00:39:19 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-28 20:02:27 +02:00
2012-04-28 20:02:27 +02:00
2012-04-28 20:02:27 +02:00
2012-04-01 00:36:43 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-05 20:22:09 +02:00
2012-04-07 22:41:37 +02:00
2012-04-20 12:11:20 -04:00
2012-04-21 19:28:35 +02:00
2012-05-06 17:25:52 +02:00
2012-05-08 23:18:48 +02:00
2012-04-07 22:41:37 +02:00
2012-05-07 18:55:44 +02:00
2012-05-11 03:33:59 +02:00
2012-04-02 21:26:08 +02:00
2012-05-06 21:53:19 +02:00
2012-05-04 18:50:59 +02:00
2012-04-21 21:39:18 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-16 16:44:12 +02:00
2012-04-26 22:24:58 +02:00
2012-04-22 22:26:55 +02:00
2012-05-08 22:02:59 +02:00
2012-05-08 22:02:59 +02:00
2012-04-18 00:28:06 +02:00
2012-04-19 21:23:52 +02:00
2012-05-01 22:06:55 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-08 22:02:59 +02:00
2012-05-08 22:02:59 +02:00
2012-05-06 21:53:19 +02:00
2012-04-30 19:48:21 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-04-10 22:53:25 +02:00
2012-04-06 22:37:38 +03:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-06 21:53:19 +02:00
2012-04-07 22:41:37 +02:00
2012-04-30 03:49:32 +02:00
2012-04-07 22:41:37 +02:00
2012-05-04 18:50:59 +02:00
2012-03-28 09:38:31 +02:00
2012-03-29 04:11:10 +02:00
2012-04-13 21:50:37 +02:00
2012-04-26 22:24:58 +02:00
2012-05-08 08:49:36 +02:00
2012-05-14 01:42:51 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-12 13:11:56 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-22 22:07:02 +02:00
2012-04-22 22:26:42 +02:00
2012-04-07 22:41:37 +02:00
2012-04-04 21:17:52 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-08 22:04:01 +02:00
2012-04-07 22:41:37 +02:00
2012-04-16 18:36:34 +02:00
2012-04-07 19:59:00 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-11 21:46:33 +02:00
2012-04-11 21:46:33 +02:00
2012-04-22 22:26:42 +02:00
2012-04-11 21:46:33 +02:00
2012-05-03 21:02:32 +02:00
2012-04-28 20:02:27 +02:00
2012-04-05 22:26:50 +02:00
2012-03-27 15:28:18 +02:00
2012-05-10 23:30:42 +02:00
2012-05-03 21:02:32 +02:00
2012-04-04 03:43:23 +02:00
2012-04-23 19:41:46 +02:00
2012-05-03 21:02:32 +02:00
2012-05-10 23:30:42 +02:00
2012-05-10 23:30:42 +02:00
2012-05-10 23:30:42 +02:00
2012-05-10 23:30:42 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-22 17:27:54 +02:00
2012-04-07 22:41:37 +02:00
2012-05-08 08:39:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-01 21:14:18 -04:00
2012-04-17 12:13:22 +02:00
2012-04-23 21:59:34 +02:00
2012-04-22 12:09:59 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 02:25:41 +02:00
2012-04-11 22:50:22 +02:00
2012-04-22 22:26:42 +02:00
2012-03-29 04:11:10 +02:00
2012-05-03 21:02:32 +02:00
2012-04-21 22:56:07 +02:00
2012-04-15 13:26:19 +02:00
2012-03-31 16:35:54 +02:00
2012-03-30 20:10:39 +02:00
2012-03-30 20:11:50 +02:00
2012-05-03 19:37:14 +02:00
2012-05-03 19:37:14 +02:00
2012-05-10 02:25:41 +02:00
2012-04-07 22:41:37 +02:00
2012-04-22 22:26:55 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-09 11:58:08 +02:00
2012-04-15 17:01:38 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-18 00:28:06 +02:00
2012-04-07 22:41:37 +02:00
2012-05-16 02:27:31 +02:00
2012-04-07 22:41:37 +02:00
2012-05-13 16:45:31 +02:00
2012-03-26 16:20:14 +02:00
2012-05-07 22:51:34 +02:00
2012-05-07 22:51:34 +02:00
2012-05-10 02:25:41 +02:00
2012-05-07 22:51:34 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-19 01:58:30 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 19:24:32 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 02:25:41 +02:00
2012-05-10 02:25:41 +02:00
2012-05-10 02:25:41 +02:00
2012-04-16 16:46:53 +02:00
2012-04-15 18:21:53 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 02:25:41 +02:00
2012-04-07 22:41:37 +02:00
2012-04-27 19:39:19 +02:00
2012-04-07 22:41:37 +02:00
2012-04-22 22:26:55 +02:00
2012-05-03 21:02:32 +02:00
2012-04-07 22:41:37 +02:00
2012-04-19 20:01:33 +02:00
2012-05-07 22:51:34 +02:00
2012-03-29 04:11:10 +02:00
2012-05-14 20:17:24 +02:00
2012-05-03 21:02:32 +02:00
2012-04-07 22:41:37 +02:00
2012-04-24 11:09:12 +02:00
2012-04-22 22:26:42 +02:00
2012-04-07 22:41:37 +02:00
2012-05-13 11:24:46 +02:00
2012-05-11 18:46:56 +02:00
2012-05-13 11:25:24 +02:00
2012-05-08 03:13:37 +02:00
2012-04-04 21:17:52 +02:00
2012-04-07 22:41:37 +02:00
2012-05-14 11:26:44 +02:00
2012-04-22 22:26:55 +02:00
2012-05-07 20:08:56 +02:00
2012-04-22 22:26:42 +02:00
2012-04-12 11:36:17 +02:00
2012-04-13 00:39:19 +02:00
2012-04-13 00:39:19 +02:00
2012-04-13 00:39:19 +02:00
2012-04-07 22:41:37 +02:00
2012-04-15 16:35:03 +02:00
2012-04-22 22:26:42 +02:00
2012-04-07 22:41:37 +02:00
2012-04-08 20:26:25 +02:00
2012-04-17 19:32:04 +02:00
2012-05-10 02:25:41 +02:00
2012-04-30 19:48:21 +02:00
2012-04-07 22:41:37 +02:00
2012-05-01 20:59:09 -04:00
2012-04-04 21:17:52 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-30 19:48:21 +02:00
2012-04-07 22:41:37 +02:00
2012-05-05 02:12:40 +02:00
2012-05-05 20:22:09 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-04 18:50:59 +02:00
2012-04-18 00:28:06 +02:00
2012-05-07 22:51:34 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 19:58:59 +02:00
2012-05-08 23:34:53 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-03-29 04:11:10 +02:00
2012-04-06 22:37:38 +03:00
2012-03-29 04:11:10 +02:00
2012-04-12 12:54:54 +02:00
2012-05-08 10:37:13 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-22 22:26:42 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-29 21:45:54 +02:00
2012-04-10 22:53:25 +02:00
2012-04-28 11:16:07 -07:00
2012-04-10 10:06:48 -07:00
2012-04-29 21:45:54 +02:00
2012-04-10 22:53:25 +02:00
2012-04-06 11:03:15 +02:00
2012-04-30 22:18:43 +02:00
2012-04-04 14:54:11 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-08 20:18:53 +02:00
2012-04-07 22:41:37 +02:00
2012-04-16 16:39:02 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-12 03:36:17 +02:00
2012-04-22 22:26:55 +02:00
2012-04-07 22:41:37 +02:00
2012-04-22 11:10:17 +02:00
2012-04-07 22:41:37 +02:00
2012-04-16 18:36:40 +02:00
2012-04-07 22:41:37 +02:00
2012-05-08 11:02:12 +02:00
2012-04-07 22:41:37 +02:00
2012-04-15 20:20:43 +02:00
2012-05-12 10:58:08 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-13 00:39:19 +02:00
2012-05-03 21:02:32 +02:00
2012-05-02 21:12:34 +02:00
2012-05-07 22:51:34 +02:00
2012-04-07 22:41:37 +02:00
2012-05-10 17:36:49 +02:00
2012-04-21 22:56:07 +02:00
2012-04-21 22:31:11 +02:00
2012-04-21 22:31:11 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-08 20:55:11 +02:00
2012-04-10 22:53:25 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 19:59:00 +02:00
2012-03-27 11:59:39 +02:00
2012-03-26 17:48:13 -07:00
2012-04-19 11:16:56 +02:00
2012-05-14 20:17:24 +02:00
2012-04-10 23:37:30 +02:00
2012-04-10 22:53:25 +02:00
2012-04-10 22:53:25 +02:00
2012-05-10 02:25:41 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-05 02:02:56 +02:00
2012-04-12 20:32:08 +02:00
2012-04-07 22:41:37 +02:00
2012-04-12 21:31:55 -07:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-05-03 21:02:32 +02:00
2012-05-11 20:57:39 +02:00
2012-04-04 13:04:38 -04:00
2012-04-04 14:54:13 +02:00
2012-04-04 14:54:13 +02:00
2012-04-07 22:41:37 +02:00
2012-05-06 21:53:19 +02:00
2012-04-22 03:49:13 +02:00
2012-04-07 22:41:37 +02:00
2012-04-21 18:56:19 +01:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
2012-04-15 16:06:52 +02:00
2012-05-01 23:30:04 +02:00
2012-04-21 21:31:25 +02:00
2012-04-10 22:53:25 +02:00
2012-04-20 21:08:35 +02:00
2012-04-07 22:41:37 +02:00
2012-05-07 22:51:34 +02:00
2012-04-07 22:41:37 +02:00
2012-04-07 22:41:37 +02:00
1cbf7fb434