Michael Niedermayer
c684cb29bc
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: fft: remove unused fft_dispatch* functions
avconv: remove unused variable opt_shortest
FATE: Add Canopus Lossless tests
cllc: Pad swapped buffer
Conflicts:
ffmpeg_opt.c
tests/ref/fate/cllc-argb
tests/ref/fate/cllc-rgb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-26 02:34:24 +02:00
..
2012-08-26 02:34:24 +02:00
2012-08-12 01:22:48 +02:00
2012-07-14 17:20:22 +02:00
2012-08-16 22:03:32 +02:00
2012-07-26 03:04:49 +02:00
2012-05-30 01:40:54 +02:00
2012-05-30 01:40:54 +02:00