Michael Niedermayer
d1c28e3530
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
build: fix standalone compilation of OMA muxer
build: fix standalone compilation of Microsoft XMV demuxer
build: fix standalone compilation of Core Audio Format demuxer
kvmc: fix invalid reads
4xm: Add a check in decode_i_frame to prevent buffer overreads
adpcm: fix IMA SMJPEG decoding
options: set minimum for "threads" to zero
bsd: use number of logical CPUs as automatic thread count
windows: use number of CPUs as automatic thread count
linux: use number of CPUs as automatic thread count
pthreads: reset active_thread_type when slice thread_init returrns early
v410dec: include correct headers
Drop ALT_ prefix from BITSTREAM_READER_LE name.
lavfi: always build vsrc_buffer.
ra144enc: zero the reflection coeffs if the filter is unstable
sws: readd PAL8 to isPacked()
mov: Don't stick the QuickTime field ordering atom in extradata.
truespeech: fix invalid reads in truespeech_apply_twopoint_filter()
Conflicts:
configure
libavcodec/4xm.c
libavcodec/avcodec.h
libavfilter/Makefile
libavfilter/allfilters.c
libavformat/Makefile
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-23 03:25:51 +01:00
2011-12-12 01:25:37 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 18:08:23 +01:00
2011-12-03 03:24:32 +01:00
2011-12-03 03:00:30 +01:00
2011-11-30 20:34:45 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2011-12-22 04:12:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 20:21:47 +01:00
2011-12-01 02:54:24 +01:00
2011-12-14 23:58:10 +01:00
2011-12-02 00:51:11 +01:00
2011-12-22 01:51:53 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-13 00:39:48 +01:00
2011-11-28 01:07:11 +01:00
2011-12-20 16:52:42 +01:00
2011-12-13 20:01:49 +01:00
2011-12-19 11:57:34 +01:00
2011-11-24 15:03:27 +01:00
2011-12-21 04:52:34 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-13 21:08:43 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-02 00:51:11 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-12-02 00:51:11 +01:00
2011-11-24 03:32:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-19 11:57:34 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 17:49:34 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2011-12-11 01:05:33 +01:00
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2011-12-22 01:51:53 +01:00
2011-12-16 01:23:15 +01:00
2011-11-24 03:32:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-03 03:24:32 +01:00
2011-12-02 00:51:11 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2011-12-04 16:44:20 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-12-22 01:51:53 +01:00
2011-12-22 00:25:47 +01:00
2011-12-14 03:38:57 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:00:30 +01:00
2011-12-03 03:24:32 +01:00
2011-12-08 21:21:34 +01:00
2011-12-02 00:51:11 +01:00
2011-12-01 02:54:24 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-23 03:25:51 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2011-11-24 03:32:24 +01:00
2011-12-02 00:51:11 +01:00
2011-12-03 03:24:32 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-12-02 00:51:11 +01:00
2011-12-02 00:51:11 +01:00
2011-12-10 02:01:03 +01:00
2011-12-09 16:12:58 -05:00
2011-12-23 03:25:51 +01:00
2011-12-23 03:25:51 +01:00
2011-12-16 01:23:15 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-12-21 03:40:53 +01:00
2011-12-20 04:12:09 +01:00
2011-12-01 02:54:24 +01:00
2011-12-16 16:59:28 +01:00
2011-12-01 02:54:24 +01:00
2011-12-21 16:28:45 +01:00
2011-12-21 16:28:42 +01:00
2011-12-21 16:28:41 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-22 01:51:53 +01:00
2011-12-13 23:07:40 +01:00
2011-12-03 03:00:30 +01:00
2011-12-21 03:40:53 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-12-06 01:37:27 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-12-19 02:34:18 +01:00
2011-12-20 22:38:53 +01:00
2011-12-19 02:34:18 +01:00
2011-12-18 16:23:16 +01:00
2011-12-01 03:53:13 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-10 22:02:44 +01:00
2011-12-13 00:39:48 +01:00
2011-12-17 03:25:46 +01:00
2011-11-28 01:07:11 +01:00
2011-12-18 23:54:56 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 15:32:20 +00:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2011-12-12 01:25:37 +01:00
2011-12-13 00:39:48 +01:00
2011-11-30 17:39:32 +02:00
2011-12-02 00:51:11 +01:00
2011-11-29 00:20:29 +01:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-12-12 01:25:37 +01:00
2011-12-02 00:51:11 +01:00
2011-12-02 00:51:11 +01:00
2011-12-13 00:39:48 +01:00
2011-12-13 00:39:48 +01:00
2011-12-13 00:39:48 +01:00
2011-12-20 19:08:04 +01:00
2011-12-12 01:25:37 +01:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01:00
2011-12-19 18:31:28 +01:00
2011-12-01 02:54:24 +01:00
2011-12-19 21:11:09 +01:00
2011-12-16 03:25:20 +01:00
2011-12-22 04:12:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-19 19:11:49 +01:00
2011-12-12 01:25:37 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-02 00:51:11 +01:00
2011-12-16 06:02:14 +01:00
2011-12-01 02:54:24 +01:00
2011-11-28 10:01:50 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-16 16:58:20 +01:00
2011-12-23 01:51:47 +01:00
2011-12-22 03:06:06 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-22 04:12:45 +01:00
2011-12-13 00:39:48 +01:00
2011-12-01 02:54:24 +01:00
2011-12-14 15:11:10 +01:00
2011-12-01 02:54:24 +01:00
2011-12-16 16:58:20 +01:00
2011-12-11 18:47:19 +00:00
2011-12-03 03:24:32 +01:00
2011-12-03 03:24:32 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-05 00:11:57 +01:00
d1c28e3530