1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
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-22 16:41:57 -04:00
2012-07-10 00:04:23 +00:00
2012-05-09 14:13:34 +01:00
2012-07-10 00:04:24 +00:00
2012-05-09 14:13:34 +01:00
2012-05-09 14:13:34 +01:00
2012-07-23 22:12:12 +02:00
2012-06-18 11:47:08 +01:00