Michael Niedermayer f8911b987d
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
mss3: use standard zigzag table
mss3: split DSP functions that are used in MTS2(MSS4) into separate file
motion-test: do not use getopt()
tcp: add initial timeout limit for incoming connections
configure: Change the rdtsc check to a linker check
avconv: propagate fatal errors from lavfi.
lavfi: add error handling to filter_samples().
fate-run: make avconv() properly deal with multiple inputs.
asplit: don't leak the input buffer.
af_resample: fix request_frame() behavior.
af_asyncts: fix request_frame() behavior.
libx264: support aspect ratio switching
matroskadec: honor error_recognition when encountering unknown elements.
lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
lavr: resampling: add filter type and Kaiser window beta to AVOptions
lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
lavr: mix: validate internal sample format in ff_audio_mix_init()
Conflicts:
ffmpeg.c
ffplay.c
libavcodec/libx264.c
libavfilter/audio.c
libavfilter/split.c
libavformat/tcp.c
tests/fate-run.sh
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-07-09 22:40:12 +02:00
2012-05-29 19:56:07 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-31 16:14:27 +02:00
2012-06-03 02:56:52 +02:00
2012-04-06 22:52:01 +02:00
2012-07-01 20:59:37 +02:00
2012-04-06 22:52:01 +02:00
2012-07-05 02:54:34 +00:00
2012-06-18 20:07:00 +02:00
2012-05-01 23:20:52 +02:00
2012-06-24 21:34:54 +02:00
2012-07-02 21:19:41 +02:00
2012-07-02 21:19:41 +02:00
2012-04-06 22:52:01 +02:00
2012-05-01 23:20:52 +02:00
2012-04-01 21:21:13 +02:00
2012-07-06 17:08:22 +02:00
2012-06-19 16:26:01 +00:00
2012-06-17 17:10:05 +02:00
2012-06-22 22:34:02 +02:00
2012-06-20 01:56:03 +00:00
2012-07-06 17:08:22 +02:00
2012-06-05 11:13:30 +02:00
2012-06-09 10:57:14 +00:00
2012-06-09 14:36:41 +02:00
2012-04-06 19:19:59 +03:00
2012-06-21 22:37:43 +02:00
2012-05-10 04:17:03 +02:00
2012-06-29 01:58:34 +00:00
2012-04-20 22:18:26 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-31 23:50:08 +02:00
2012-06-04 07:41:22 +02:00
2012-05-05 20:22:09 +02:00
2012-05-07 02:42:00 +02:00
2012-06-16 17:59:01 +02:00
2012-07-05 10:55:49 +02:00
2012-04-06 22:52:01 +02:00
2012-07-08 22:33:32 +02:00
2012-04-06 22:52:01 +02:00
2012-06-28 23:57:31 +02:00
2012-07-07 02:17:30 +02:00
2012-06-28 23:57:31 +02:00
2012-05-20 19:50:32 -04:00
2012-05-30 01:40:54 +02:00
2012-05-01 23:20:52 +02:00
2012-06-04 07:41:22 +02:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-06-28 00:18:24 +02:00
2012-07-06 17:08:22 +02:00
2012-07-08 22:33:32 +02:00
2012-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-05-20 22:58:04 +02:00
2012-06-19 20:53:27 +02:00
2012-04-06 08:32:09 +02:00
2012-06-24 21:34:54 +02:00
2012-06-24 21:34:54 +02:00
2012-05-01 23:20:52 +02:00
2012-05-31 16:19:26 +02:00
2012-06-19 20:53:27 +02:00
2012-06-11 07:35:14 +02:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-06-21 22:37:43 +02:00
2012-04-06 22:52:01 +02:00
2012-06-29 20:19:59 +02:00
2012-05-03 19:37:14 +02:00
2012-07-03 09:53:42 +00:00
2012-04-14 18:21:19 +02:00
2012-07-05 13:02:49 +02:00
2012-05-21 08:51:50 +02:00
2012-06-04 00:33:42 +02:00
2012-03-31 12:37:42 +02:00
2012-07-05 02:54:34 +00:00
2012-07-09 22:40:12 +02:00
2012-05-21 23:53:39 +02:00
2012-05-21 23:53:39 +02:00
2012-06-29 20:20:01 +02:00
2012-05-01 23:20:52 +02:00
2012-06-20 20:47:46 +02:00
2012-06-27 13:47:58 -07:00
2012-07-04 21:03:28 +02:00
2012-07-09 15:30:59 +02:00
2012-06-11 07:35:14 +02:00
2012-05-26 22:37:37 +02:00
2012-05-30 09:08:29 -07:00
2012-05-13 16:49:17 +02:00
2012-06-27 01:58:09 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-05-06 21:53:19 +02:00
2012-06-19 20:53:27 +02:00
2012-06-13 18:51:38 +02:00
2012-05-20 22:58:04 +02:00
2012-04-06 22:52:01 +02:00
2012-04-19 15:08:13 +02:00
2012-07-07 20:29:43 +02:00
2012-07-05 13:34:49 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-06-27 01:58:09 +02:00
2012-06-27 01:58:09 +02:00
2012-05-06 21:53:19 +02:00
2012-04-06 22:52:01 +02:00
2012-07-05 04:23:55 +02:00
2012-06-30 18:58:52 +02:00
2012-07-08 17:08:56 +02:00
2012-04-06 22:52:01 +02:00
2012-06-02 22:50:40 +02:00
2012-04-01 00:36:43 +02:00
2012-04-18 15:30:34 +02:00
2012-05-05 00:00:40 +02:00
2012-05-31 20:25:23 +02:00
2012-04-16 18:36:39 +02:00
2012-04-16 18:36:39 +02:00
2012-05-10 17:22:27 +02:00
2012-05-10 02:25:41 +02:00
2012-06-28 09:59:53 +02:00
2012-06-30 22:44:18 +02:00
2012-06-30 22:44:18 +02:00
2012-07-08 20:49:04 +00:00
2012-06-14 23:52:23 +02:00
2012-04-06 22:52:01 +02:00
2012-06-14 23:52:40 +02:00
2012-06-21 20:52:56 +02:00
2012-04-06 22:52:01 +02:00
2012-06-29 20:22:04 +02:00
2012-07-04 04:17:00 +02:00
2012-05-31 00:46:02 +02:00
2012-04-20 22:18:26 +02:00
2012-04-29 13:03:15 +02:00
2012-05-01 23:20:52 +02:00
2012-06-22 22:34:02 +02:00
2012-06-15 00:14:21 +02:00
2012-06-15 00:14:21 +02:00
2012-06-19 20:53:27 +02:00
2012-07-04 00:32:31 +02:00
2012-04-08 20:55:11 +02:00
2012-04-08 20:55:11 +02:00
2012-06-19 20:53:27 +02:00
2012-06-14 22:11:43 +03:00
2012-06-20 20:47:46 +02:00
2012-06-19 20:53:27 +02:00
2012-04-08 20:55:11 +02:00
2012-07-06 17:08:22 +02:00
2012-04-08 20:55:11 +02:00
2012-06-29 15:38:10 +03:00
2012-05-26 22:37:37 +02:00
2012-05-26 22:37:37 +02:00
2012-06-17 00:38:39 +02:00
2012-06-18 20:07:00 +02:00
2012-06-19 20:53:27 +02:00
2012-06-18 20:07:00 +02:00
2012-06-20 20:47:46 +02:00
2012-06-20 20:47:46 +02:00
2012-05-10 02:25:41 +02:00
2012-04-08 20:55:11 +02:00
2012-06-20 20:47:46 +02:00
2012-06-29 20:21:28 +02:00
2012-06-20 20:47:46 +02:00
2012-05-26 22:37:37 +02:00
2012-06-26 17:22:21 +03:00
2012-06-19 20:53:27 +02:00
2012-05-04 14:40:22 +02:00
2012-04-16 02:18:09 +02:00
2012-07-08 17:38:24 +02:00
2012-04-06 22:52:01 +02:00
2012-04-22 11:23:58 +02:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00
2012-06-29 01:58:34 +00:00
2012-07-08 20:49:35 +00:00
2012-05-01 23:20:52 +02:00
2012-05-01 23:20:52 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-06-15 18:40:14 +02:00
2012-06-21 20:52:56 +02:00
2012-06-29 20:20:02 +02:00
2012-06-29 20:20:02 +02:00
2012-05-18 23:34:11 +02:00
2012-04-03 19:12:52 +02:00
2012-06-07 21:30:07 +02:00
2012-07-09 22:40:12 +02:00
2012-04-06 22:52:01 +02:00
2012-04-06 22:52:01 +02:00
2012-06-28 10:12:04 +02:00
2012-06-01 14:47:30 +02:00
2012-07-08 22:29:34 +02:00
2012-04-06 22:52:01 +02:00
2012-07-08 17:38:04 +02:00
2012-04-06 22:52:01 +02:00
2012-06-25 03:45:29 +02:00
2012-05-21 23:53:39 +02:00
2012-06-25 16:20:08 +03:00
2012-07-06 17:08:22 +02:00
2012-07-06 17:08:22 +02:00
2012-05-31 14:47:15 +02:00
2012-05-08 16:53:03 +02:00
f8911b987d