Michael Niedermayer
4640da7e58
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
sgidec: Use bytestream2 functions to prevent buffer overreads.
cosmetics: Move static and inline attributes to more standard places.
configure: provide libavfilter/version.h header to get_version()
swscale: change yuv2yuvX code to use cpuflag().
libx264: Don't leave max_b_frames as -1 if the user didn't set it
FATE: convert output to rgba for the targa tests which currently output pal8
fate: add missing reference files for targa tests in 9c2f9b0e2
FATE: enable the 2 remaining targa conformance suite tests
targa: add support for rgb555 palette
FATE: fix targa tests on big-endian systems
Conflicts:
libavcodec/sgidec.c
libavcodec/targa.c
libswscale/x86/output.asm
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-15 01:16:54 +01:00
..
2011-11-03 19:25:26 +01:00
2011-07-05 02:26:17 +02:00
2011-09-16 20:44:27 +02:00
2011-11-24 03:32:24 +01:00
2011-11-06 00:05:14 +01:00
2011-12-31 16:25:11 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-27 15:21:08 +01:00
2012-01-01 16:43:32 +01:00
2011-11-06 00:05:14 +01:00
2011-11-18 19:39:26 +01:00
2012-01-08 17:08:55 +01:00
2012-01-05 21:53:18 +01:00
2011-09-16 00:46:41 +02:00
2012-01-08 17:08:55 +01:00
2011-11-06 00:05:14 +01:00
2011-11-24 03:32:24 +01:00
2011-08-21 11:37:57 +02:00
2011-12-04 21:13:22 +01:00
2011-11-26 01:12:08 +01:00
2011-12-26 04:10:47 +01:00
2011-12-26 04:10:47 +01:00
2012-01-12 16:32:54 +01:00
2012-01-13 01:29:48 +01:00
2011-09-28 08:02:53 +02:00
2011-11-22 15:09:26 +01:00
2011-12-08 21:19:23 +01:00
2011-12-25 16:18:57 +01:00
2012-01-12 16:32:54 +01:00
2011-10-28 02:06:50 +02:00
2011-10-28 02:06:50 +02:00
2011-12-22 10:09:42 +01:00
2011-05-17 03:05:36 +02:00
2011-09-28 08:02:53 +02:00
2012-01-12 16:32:54 +01:00
2010-01-16 04:49:02 +00:00
2012-01-13 01:29:48 +01:00
2011-12-22 10:09:42 +01:00
2011-12-26 04:10:47 +01:00
2011-12-13 21:08:43 +01:00
2011-10-20 15:59:20 +02:00
2012-01-13 01:29:48 +01:00
2011-11-06 00:05:14 +01:00
2011-11-26 10:42:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-25 04:45:41 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2012-01-13 17:00:21 +01:00
2011-11-06 00:05:14 +01:00
2012-01-11 18:14:03 +01:00
2012-01-15 01:16:54 +01:00
2011-11-06 00:05:14 +01:00
2011-11-21 19:35:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-23 13:22:46 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-14 05:42:10 +01:00
2011-11-06 00:05:14 +01:00
2011-12-06 15:03:51 +01:00
2011-11-16 07:48:23 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-27 11:15:21 +01:00
2012-01-01 16:16:50 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-13 23:21:37 +01:00
2011-11-06 00:05:14 +01:00
2012-01-13 01:29:48 +01:00
2011-09-19 12:43:10 +02:00
2011-12-11 11:55:33 +01:00
2011-11-06 00:05:14 +01:00
2011-12-11 14:14:01 +01:00
2011-11-24 00:08:05 +01:00
2011-11-06 00:05:14 +01:00
2012-01-12 10:39:24 +01:00
2011-04-03 08:46:19 +02:00