Michael Niedermayer
afc0a24d7d
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
avcodec: add support for planar signed 8-bit PCM.
ra144enc: add sample_fmts list to ff_ra_144_encoder
smackaud: use uint8_t* for 8-bit output buffer type
smackaud: clip output samples
smackaud: use sign_extend() for difference value instead of casting
sipr: use a function pointer to select the decode_frame function
sipr: set mode based on block_align instead of bit_rate
sipr: do not needlessly set *data_size to 0 when returning an error
ra288: fix formatting of LOCAL_ALIGNED_16
udp: Allow specifying the local IP address
VC1: Add bottom field offset to block_index[] to avoid rewriting (+10L)
vc1dec: move an if() block.
vc1dec: use correct hybrid prediction threshold.
vc1dec: Partial rewrite of vc1_pred_mv()
vc1dec: take ME precision into account while scaling MV predictors.
lavf: don't leak corrupted packets
Conflicts:
libavcodec/8svx.c
libavcodec/ra288.c
libavcodec/version.h
libavformat/iff.c
libavformat/udp.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-10 03:45:23 +01:00
2011-10-20 02:34:51 +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-10-21 02:01:26 +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-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-11-05 16:51:25 +01:00
2011-11-03 02:16:26 +01:00
2011-11-05 16:51:25 +01:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-11-08 10:35:14 +01:00
2011-11-09 02:59:49 +01:00
2011-11-06 11:52:57 +02:00
2011-10-01 03:48:33 +02:00
2011-11-07 04:24:49 +01:00
2011-11-03 02:16:26 +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-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-11-03 20:22:10 +01:00
2011-10-20 02:34:51 +02:00
2011-10-12 16:51:16 +02: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-10-30 01:33:41 +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-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +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-10-20 02:34:51 +02:00
2011-11-08 17:39:39 +01:00
2011-11-03 02:16:26 +01: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-11-02 19:36:04 -04:00
2011-11-01 18:41:46 +01:00
2011-09-28 18:13:52 +02:00
2011-11-06 11:52:57 +02:00
2011-11-06 02:23:34 +01: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-11-10 03:45:23 +01:00
2011-11-06 11:52:57 +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-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-10-20 02:34:51 +02:00
2011-11-05 15:07:19 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 02:03:14 +01:00
2011-11-06 02:23:34 +01:00
2011-11-08 02:03:14 +01:00
2011-11-06 11:52:57 +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-11-01 12:59:15 +01: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-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-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-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-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-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-10-20 13:06:16 -04: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-10-13 06:00:03 +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-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-11-08 02:03:14 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-11-08 02:03:14 +01:00
2011-10-20 02:34:51 +02:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-10-18 01:54:40 +02:00
2011-09-27 02:14:37 +02:00
2011-11-07 21:55:34 +01:00
2011-11-07 21:55:34 +01:00
2011-11-07 03:01:43 +01:00
2011-11-06 11:52:57 +02:00
2011-11-07 21:55:34 +01:00
2011-10-13 06:00:03 +02:00
2011-10-20 02:34:51 +02:00
2011-10-21 02:01:26 +02: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-08 02:03:14 +01:00
2011-11-03 02:16:26 +01: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-10-21 02:01:26 +02:00
2011-10-29 02:08:54 +02: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-10-20 02:34:51 +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-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-27 01:03:22 +02:00
2011-11-08 22:58:54 +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-11-09 17:47:10 +01:00
2011-10-20 02:34:51 +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-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-11-06 01:53:46 +01:00
2011-11-06 02:40:31 +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
afc0a24d7d