Michael Niedermayer
130dc95187
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
FATE: add a bink version 'b' test
FATE: add a bink version 'i' test
libswscale: remove unnecessary direct #if LIBSWSCALE_VERSION_MAJOR
Conflicts:
tests/fate/video.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17 13:06:12 +01:00
2012-11-17 13:06:12 +01:00
2012-11-17 13:06:12 +01:00
2012-07-29 02:16:26 +02:00
2012-01-19 01:19:38 +01:00
2011-07-07 22:47:24 +02:00
2012-07-09 22:40:12 +02:00
2011-03-19 13:35:52 +00:00
2012-01-21 12:04:46 +01:00
2012-09-06 16:23:17 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2012-11-05 22:31:24 +00:00
2012-11-11 22:43:18 +01:00
2012-11-07 18:33:52 +01:00
2012-10-16 14:04:14 +02:00
2012-05-30 05:57:56 +02:00
2012-06-07 21:45:52 +02:00
2012-10-08 11:03:27 +02:00
2012-10-16 14:04:14 +02:00
2012-05-30 01:40:54 +02:00
2012-06-07 21:45:52 +02:00
130dc95187