Michael Niedermayer
29582df797
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
vble: remove vble_error_close
VBLE Decoder
tta: use an integer instead of a pointer to iterate output samples
shorten: do not modify samples pointer when interleaving
mpc7: only support stereo input.
dpcm: do not try to decode empty packets
dpcm: remove unneeded buf_size==0 check.
twinvq: add SSE/AVX optimized sum/difference stereo interleaving
vqf/twinvq: pass vqf COMM chunk info in extradata
vqf: do not set bits_per_coded_sample for TwinVQ.
twinvq: check for allocation failure in init_mdct_win()
swscale: add padding to conversion buffer.
rtpdec: Simplify finalize_packet
http: Handle proxy authentication
http: Print an error message for Authorization Required, too
AVOptions: don't return an invalid option when option list is empty
AIFF: add 'twos' FourCC for the mux/demuxer (big endian PCM audio)
Conflicts:
libavcodec/avcodec.h
libavcodec/tta.c
libavcodec/vble.c
libavcodec/version.h
libavutil/opt.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-12 02:50:25 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-11-05 15:07:19 +01:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-11-12 02:50:25 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-11-08 02:03:14 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-11-05 16:51:25 +01:00
2011-06-24 03:07:04 +02:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2011-11-11 23:49:30 +01:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2011-11-08 10:35:14 +01:00
2011-03-19 13:33:20 +00:00
2011-11-11 02:50:35 +01:00
2011-03-19 13:33:20 +00:00
2011-11-09 02:59:49 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-06 11:52:57 +02:00
2011-10-01 03:48:33 +02:00
2011-05-22 04:53:19 +02:00
2011-11-11 02:50:35 +01:00
2011-07-03 03:14:10 +02:00
2011-11-03 02:16:26 +01:00
2011-11-03 02:16:26 +01:00
2011-09-08 22:37:31 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-05 15:07:19 +01:00
2011-10-30 15:39:26 +01:00
2011-11-08 00:36:45 +02:00
2011-10-20 02:34:51 +02:00
2011-10-16 21:51:28 +02:00
2011-08-01 00:58:49 +02:00
2011-04-28 10:45:32 +02:00
2011-11-03 20:22:10 +01:00
2011-08-22 09:35:58 +02:00
2011-05-27 23:48:22 +02:00
2011-10-20 02:34:51 +02:00
2011-04-09 03:17:07 +02:00
2011-07-17 20:12:02 +02:00
2011-11-10 11:37:38 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-10-30 01:33:41 +02:00
2011-07-17 20:12:02 +02:00
2011-11-03 02:16:26 +01:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-09-07 07:27:55 +02:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-06-09 04:47:19 +02:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-11-02 10:43:39 +01:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-09-07 02:36:42 +02:00
2011-11-08 17:39:39 +01:00
2011-11-03 02:16:26 +01:00
2011-07-17 20:12:02 +02:00
2011-11-05 15:07:19 +01:00
2011-10-29 22:08:25 +02:00
2011-10-13 06:00:03 +02:00
2011-04-21 03:37:05 +02:00
2011-11-02 19:36:04 -04:00
2011-11-01 18:41:46 +01:00
2011-03-19 13:33:20 +00:00
2011-09-28 18:13:52 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-05-27 23:48:22 +02:00
2011-11-12 02:50:25 +01:00
2011-11-11 02:50:35 +01:00
2011-11-12 02:50:25 +01:00
2011-03-19 13:33:20 +00:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2011-10-24 01:01:21 +02:00
2011-11-03 20:21:01 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-24 22:39:52 +02:00
2011-11-10 03:45:23 +01:00
2011-11-06 11:52:57 +02:00
2011-09-17 22:36:43 +02:00
2011-11-08 10:35:14 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 10:33:21 +01:00
2011-10-29 02:08:54 +02:00
2011-10-20 02:34:51 +02:00
2011-10-28 03:05:16 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-28 21:46:30 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-07-06 01:34:08 +02:00
2011-10-20 02:34:51 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-05-27 23:48:22 +02:00
2011-11-08 02:03:14 +01:00
2011-05-24 23:34:24 +02:00
2011-05-29 03:34:35 +02:00
2011-11-06 02:23:34 +01:00
2011-11-08 02:03:14 +01:00
2011-07-17 20:12:02 +02:00
2011-04-20 04:48:23 +02:00
2011-11-06 11:52:57 +02:00
2011-06-09 04:47:19 +02:00
2011-11-05 15:07:19 +01:00
2011-04-04 01:29:40 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-04-20 04:48:23 +02:00
2011-05-22 04:53:19 +02:00
2011-11-11 02:50:35 +01:00
2011-05-17 03:05:36 +02:00
2011-11-08 10:33:21 +01:00
2011-11-05 12:35:34 +02:00
2011-11-02 10:42:54 +01:00
2011-07-11 04:23:25 +02:00
2011-10-21 02:01:26 +02:00
2011-11-06 11:52:57 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-26 02:36:07 +02:00
2011-11-08 18:56:39 +01:00
2011-10-29 02:08:54 +02:00
2011-11-02 20:41:24 +01:00
2011-11-08 23:54:25 +01:00
2011-08-09 19:56:25 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-09-27 22:27:52 +02:00
2011-03-19 13:33:20 +00:00
2011-11-09 02:59:49 +01:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-08 02:03:14 +01:00
2011-11-08 02:03:14 +01:00
2011-11-02 10:42:54 +01:00
2011-07-17 20:12:02 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-11-06 11:52:57 +02:00
2011-10-21 02:01:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-29 02:08:54 +02:00
2011-09-26 13:51:29 +02:00
2011-11-02 10:43:39 +01:00
2011-10-25 15:04:51 +02:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-06-02 20:06:00 +01:00
2011-03-19 13:33:20 +00:00
2011-10-20 13:06:16 -04:00
2011-02-06 16:08:59 -05:00
2011-10-20 20:57:23 +02:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-11-07 03:01:43 +01:00
2011-11-03 02:16:26 +01:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-09-24 22:39:52 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-09-17 22:36:43 +02:00
2011-10-13 16:50:20 +02:00
2011-03-19 13:33:20 +00:00
2011-10-13 06:00:03 +02:00
2011-11-08 02:03:14 +01:00
2011-07-14 20:44:58 +02:00
2011-11-12 01:21:01 +01:00
2011-04-15 04:50:06 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-11-08 02:03:14 +01:00
2011-07-17 20:12:02 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-04-04 02:15:12 +02:00
2011-03-19 13:33:20 +00:00
2011-07-04 00:45:21 +02:00
2011-07-03 03:14:10 +02:00
2011-09-23 00:35:31 +02:00
2011-10-18 01:54:40 +02:00
2011-09-27 02:14:37 +02:00
2011-04-24 03:41:22 +02:00
2011-09-08 22:37:31 +02:00
2011-11-07 21:55:34 +01:00
2011-11-07 21:55:34 +01:00
2011-03-19 13:33:20 +00:00
2011-04-24 03:41:22 +02:00
2011-11-07 03:01:43 +01:00
2011-11-06 11:52:57 +02:00
2011-04-24 03:41:22 +02:00
2011-05-13 04:40:40 +02:00
2011-04-24 03:41:22 +02:00
2011-07-15 17:51:09 +02:00
2011-07-15 17:51:09 +02:00
2011-04-24 03:41:22 +02:00
2011-11-12 02:50:25 +01:00
2011-10-13 06:00:03 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-04-09 03:17:07 +02:00
2011-03-19 13:33:20 +00:00
2011-06-15 20:21:33 +02:00
2011-06-17 05:49:58 +02:00
2011-10-21 02:01:26 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-18 01:54:40 +02:00
2011-10-13 06:00:03 +02:00
2011-10-13 06:00:03 +02:00
2011-11-11 02:50:35 +01:00
2011-11-03 02:16:26 +01:00
2011-03-19 13:33:20 +00:00
2011-10-18 01:54:40 +02:00
2011-10-18 01:54:40 +02:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-03-19 13:33:20 +00:00
2011-10-21 02:01:26 +02:00
2011-10-29 02:08:54 +02:00
2011-07-04 00:45:21 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-10-17 16:51:48 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-03-19 13:33:20 +00:00
2011-05-22 04:53:19 +02:00
2011-10-21 02:01:26 +02:00
2011-10-30 15:43:19 +02:00
2011-10-20 02:34:51 +02:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-05-30 02:39:26 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-27 01:03:22 +02:00
2011-11-10 23:23:10 +02:00
2011-10-20 02:34:51 +02:00
2011-10-26 02:36:07 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-10 03:45:23 +01:00
2011-07-14 20:44:58 +02:00
2011-11-09 17:47:10 +01:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-11-08 02:03:14 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-10-20 02:34:51 +02:00
2011-07-17 20:12:02 +02:00
2011-06-09 04:47:19 +02:00
2011-06-09 04:47:19 +02:00
2011-11-12 02:50:25 +01:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-11-06 11:53:05 +02:00
2011-09-08 01:55:07 +02:00
2011-11-06 01:53:46 +01:00
2011-11-12 00:15:03 +01:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
2011-10-20 02:34:51 +02:00
29582df797