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

96 KiB

Raw Blame History

View Raw