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-07-01 22:43:09 +02:00
2012-07-05 12:24:03 +02:00
2012-06-13 22:43:57 +02:00
2012-07-07 20:29:43 +02:00
2012-06-11 21:40:43 +02:00
2012-06-17 00:53:06 +00:00
2012-06-17 00:53:06 +00:00
2012-06-08 23:59:09 +02:00
2012-06-06 18:35:05 +02:00
2012-07-08 00:26:27 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-21 22:37:43 +02:00
2012-06-03 01:53:36 +02:00
2012-06-23 00:30:37 +00:00
2012-06-23 00:30:37 +00:00
2012-06-08 23:59:09 +02:00
2012-06-08 23:59:09 +02:00
2012-06-08 13:14:38 -04:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-07-05 02:54:34 +00:00
2012-07-02 23:43:06 +02:00
2012-07-04 21:03:28 +02:00
2012-07-04 21:03:28 +02:00
2012-06-11 21:12:39 +02:00
2012-07-04 21:03:28 +02:00
2012-06-11 21:12:39 +02:00
2012-07-04 00:32:31 +02:00
2012-06-29 20:20:02 +02:00
2012-06-29 14:54:15 +02:00
2012-06-18 21:44:22 +02:00
2012-06-29 14:54:15 +02:00
2012-06-08 23:59:09 +02:00
2012-07-06 02:25:29 +02:00
2012-06-04 00:33:42 +02:00
2012-06-09 10:43:20 +00:00
2012-06-12 20:47:38 +00:00
2012-06-22 22:47:33 +00:00
2012-07-06 02:19:21 +00:00
2012-07-07 12:33:51 +02:00
2012-06-29 01:58:34 +00:00
2012-06-11 21:12:39 +02:00
2012-06-11 21:12:39 +02:00
2012-07-07 12:34:04 +02:00
2012-06-11 21:12:39 +02:00
2012-06-21 22:37:43 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 13:31:44 +02:00
2012-06-28 22:26:15 +02:00
2012-06-12 20:47:38 +00:00
2012-06-20 20:47:46 +02:00
2012-06-19 20:53:27 +02:00
2012-06-29 14:54:15 +02:00
2012-06-09 20:09:43 +02:00
2012-06-23 00:30:37 +00:00
2012-06-30 22:44:18 +02:00
2012-07-08 23:40:55 +00:00
2012-07-02 21:19:41 +02:00
2012-07-03 03:31:06 +02:00
2012-07-04 00:32:31 +02:00
2012-06-04 20:42:00 +02:00
2012-06-18 20:07:00 +02:00
2012-06-18 20:07:00 +02:00
2012-06-26 11:59:24 +03:00
2012-06-28 01:08:52 +02:00
2012-06-23 00:30:37 +00:00
2012-06-29 14:54:15 +02:00
2012-07-04 21:03:28 +02:00
2012-06-12 20:47:38 +00:00
2012-07-09 02:51:06 +00:00
2012-06-20 20:47:46 +02:00
2012-06-12 20:47:38 +00:00
2012-07-04 21:03:28 +02:00
2012-07-04 21:03:28 +02:00
2012-07-07 02:17:30 +02:00
2012-07-07 02:17:30 +02:00
2012-07-07 02:17:30 +02:00
2012-07-07 02:17:30 +02:00
2012-07-04 21:03:28 +02:00
2012-06-14 15:48:43 +00:00
2012-06-23 01:38:47 +02:00
2012-06-23 01:38:47 +02:00
2012-07-08 23:40:55 +00:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-06-12 14:33:39 -04:00
2012-06-17 00:53:06 +00:00
2012-06-07 21:31:22 +02:00
2012-06-07 21:32:32 +02:00
2012-06-24 21:34:54 +02:00
2012-06-25 23:10:45 +02:00
2012-07-05 21:55:31 +02:00
2012-07-05 21:55:31 +02:00
2012-06-07 21:07:17 +02:00
2012-06-25 23:10:45 +02:00
2012-07-05 19:18:10 +02:00
2012-07-01 20:49:31 +02:00
2012-07-05 21:55:31 +02:00
2012-06-29 14:54:15 +02:00
2012-07-03 03:31:06 +02:00
2012-07-03 03:31:06 +02:00
2012-06-18 21:44:48 +02:00
2012-06-17 00:53:06 +00:00
2012-06-17 00:53:06 +00:00
2012-06-09 20:30:17 +02:00
2012-07-03 19:03:26 +02:00
2012-06-09 20:30:17 +02:00
2012-06-17 21:32:43 +02:00
2012-07-02 23:16:59 +02:00
2012-07-01 18:04:08 +02:00
2012-06-29 14:54:15 +02:00
2012-06-10 23:27:17 +02:00
2012-06-15 12:10:25 +00:00
2012-06-12 20:47:38 +00:00
2012-06-04 20:01:36 +02:00
2012-07-03 13:06:23 +00:00
2012-06-29 14:54:15 +02:00
2012-06-12 20:47:38 +00:00
2012-07-06 02:44:17 +02:00
2012-06-17 00:53:06 +00:00
2012-06-19 20:43:28 +00:00
2012-06-10 21:34:15 +02:00
2012-07-04 08:37:52 -06:00
2012-07-04 08:37:46 -06:00
2012-06-19 16:44:34 +02:00
2012-06-23 00:29:34 +00:00
2012-06-22 22:34:02 +02:00
2012-06-12 22:12:26 +00:00
2012-06-23 00:30:37 +00:00
2012-06-11 02:06:43 +02:00
2012-07-09 22:40:12 +02:00
2012-06-14 21:55:13 +02:00
2012-07-06 04:04:10 +02:00
2012-06-28 00:07:22 +02:00
2012-06-03 15:01:34 +02:00
2012-07-09 22:40:12 +02:00
2012-06-29 20:20:02 +02:00
2012-06-20 18:19:53 +02:00
2012-06-29 14:54:15 +02:00
2012-06-23 01:38:47 +02:00
2012-06-14 21:55:13 +02:00
2012-06-24 20:20:23 +02:00
2012-06-17 00:53:06 +00:00
2012-06-15 03:14:07 +02:00
2012-07-09 22:40:12 +02:00
2012-06-06 13:09:02 +02:00
2012-06-29 14:54:15 +02:00
2012-06-29 14:54:15 +02:00
2012-07-09 15:38:28 +02:00
2012-07-09 15:38:16 +02:00
2012-07-05 12:24:03 +02:00
2012-07-05 12:24:03 +02:00
2012-07-05 12:24:03 +02:00
2012-07-08 17:59:56 +02:00
2012-07-05 21:55:31 +02:00
2012-06-19 21:38:18 +02:00
2012-07-04 21:03:28 +02:00
2012-07-04 21:03:28 +02:00
2012-06-17 17:09:34 +02:00
2012-06-28 01:08:52 +02:00
2012-07-09 22:40:12 +02:00
2012-07-09 22:40:12 +02:00
2012-07-09 22:40:12 +02:00
2012-06-08 23:59:09 +02:00
2012-07-07 02:17:30 +02:00
2012-06-19 17:22:07 +02:00
2012-07-06 00:19:12 +00:00
2012-07-05 02:54:34 +00:00
2012-06-29 14:54:15 +02:00
2012-06-23 00:42:51 +02:00
2012-06-15 00:53:34 +00:00
2012-06-15 00:53:34 +00:00
2012-06-15 00:53:34 +00:00
2012-06-15 00:53:34 +00:00
2012-06-29 20:43:30 +02:00
2012-06-15 00:53:34 +00:00
2012-06-29 20:43:30 +02:00
2012-06-04 12:18:56 +02:00
2012-06-29 20:43:30 +02:00
2012-07-02 21:19:41 +02:00
2012-06-23 01:38:47 +02:00
2012-06-06 21:18:14 +02:00
2012-07-05 21:55:31 +02:00
2012-06-19 16:44:35 +02:00
2012-06-08 23:59:09 +02:00
2012-06-10 23:36:22 +02:00
2012-06-24 20:18:00 +02:00
2012-07-04 21:03:28 +02:00
2012-07-05 04:23:55 +02:00
2012-07-03 01:25:02 +02:00
2012-06-29 20:22:04 +02:00
2012-06-07 20:51:07 +02:00
2012-07-02 20:52:22 +02:00
2012-07-02 21:19:41 +02:00
2012-07-02 21:19:41 +02:00
2012-06-08 18:24:47 +02:00
2012-06-11 20:13:31 +02:00
2012-06-19 17:13:45 +02:00
2012-06-29 20:21:28 +02:00
2012-06-21 01:30:16 +00:00
2012-07-07 22:33:13 +00:00
2012-07-08 23:43:18 +00:00
2012-06-29 14:54:15 +02:00
2012-06-21 22:37:43 +02:00
2012-06-08 11:44:50 +02:00
2012-07-02 21:19:41 +02:00
2012-07-04 01:02:01 +02:00
2012-07-04 00:32:31 +02:00
2012-07-04 01:02:01 +02:00
2012-07-04 00:32:31 +02:00
2012-06-26 00:38:05 +02:00
2012-06-17 00:53:06 +00:00
2012-06-07 18:01:09 +02:00
2012-06-29 14:54:15 +02:00
2012-07-06 01:11:34 +00:00
2012-07-09 01:55:16 +00:00
2012-06-21 22:37:43 +02:00
2012-06-08 23:59:09 +02:00
2012-07-09 13:46:55 +02:00
2012-06-22 22:34:02 +02:00
2012-06-13 22:43:57 +02:00
2012-07-07 13:02:22 +02:00
2012-06-21 19:49:37 +02:00
2012-07-02 20:52:36 +02:00
2012-06-29 14:54:15 +02:00
2012-07-05 02:54:34 +00:00
2012-06-21 01:23:15 +00:00
2012-06-06 01:08:33 +02:00
2012-06-06 01:08:33 +02:00
2012-06-18 20:07:00 +02:00
2012-06-06 01:08:33 +02:00
2012-06-17 19:50:58 +02:00
2012-06-14 02:38:35 +00:00
2012-06-21 11:47:00 +02:00
2012-06-29 20:43:30 +02:00
2012-07-01 22:43:09 +02:00
2012-07-01 22:43:09 +02:00
2012-07-02 12:48:29 +02:00
2012-06-29 14:54:15 +02:00
2012-06-06 21:18:47 +02:00
2012-06-29 01:58:34 +00:00
2012-07-04 00:32:31 +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
f8911b987d