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>

diff --cc ffmpeg_opt.c
index 942d3b5,4e483de..7505ba9
--- 1/ffmpeg_opt.c
--- 2/avconv_opt.c
+++ b/ffmpeg_opt.c
@@@ -70,9 -68,7 +70,8 @@@ int do_benchmark_all  = 0
  int do_hex_dump       = 0;
  int do_pkt_dump       = 0;
  int copy_ts           = 0;
 -int copy_tb           = 1;
 +int copy_tb           = -1;
 +int debug_ts          = 0;
- int opt_shortest      = 0;
  int exit_on_error     = 0;
  int print_stats       = 1;
  int qp_hist           = 0;

diff --cc libavcodec/cllc.c
Simple merge

diff --cc libavcodec/x86/fft_mmx.asm
Simple merge

diff --cc tests/fate/lossless-video.mak
index 9553817,5055730..2ae035b
--- 1/tests/fate/lossless-video.mak
--- 2/tests/fate/lossless-video.mak
+++ b/tests/fate/lossless-video.mak
@@@ -1,3 -1,12 +1,12 @@@
 -FATE_SAMPLES_AVCONV += $(FATE_CLLC)
+ FATE_CLLC += fate-cllc-rgb
+ fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi
+ 
+ FATE_CLLC += fate-cllc-argb
+ fate-cllc-argb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-argb.avi
+ 
++FATE_LOSSLESS_VIDEO += $(FATE_CLLC)
+ fate-cllc: $(FATE_CLLC)
+ 
  FATE_LAGARITH += fate-lagarith-rgb24
  fate-lagarith-rgb24: CMD = framecrc -i $(SAMPLES)/lagarith/lag-rgb24.avi
  
@@@ -19,32 -28,20 +28,23 @@@ fate-loco-rgb: CMD = framecrc -i $(SAMP
  FATE_LOCO += fate-loco-yuy2
  fate-loco-yuy2: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-0.avi
  
 -FATE_SAMPLES_AVCONV += $(FATE_LOCO)
 +FATE_LOSSLESS_VIDEO += $(FATE_LOCO)
  fate-loco: $(FATE_LOCO)
  
 -FATE_SAMPLES_AVCONV += fate-msrle-8bit
 +FATE_LOSSLESS_VIDEO += fate-msrle-8bit
  fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24
  
 -FATE_SAMPLES_AVCONV += fate-mszh
 +FATE_LOSSLESS_VIDEO += fate-mszh
  fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi
  
 -FATE_SAMPLES_AVCONV += fate-vble
 +FATE_LOSSLESS_VIDEO += fate-vble
  fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi
  
 -FATE_SAMPLES_AVCONV += fate-zlib
 +FATE_LOSSLESS_VIDEO += fate-zlib
  fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi
  
 -FATE_SAMPLES_AVCONV += fate-zerocodec
 +FATE_LOSSLESS_VIDEO += fate-zerocodec
  fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi
- FATE_CLLC += fate-cllc-rgb
- fate-cllc-rgb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-rgb.avi
- 
- FATE_CLLC += fate-cllc-argb
- fate-cllc-argb: CMD = framecrc -i $(SAMPLES)/cllc/sample-cllc-argb.avi
- 
- FATE_LOSSLESS_VIDEO += $(FATE_CLLC)
- fate-cllc: $(FATE_CLLC)
- 
 +
 +FATE_SAMPLES_FFMPEG += $(FATE_LOSSLESS_VIDEO)
 +fate-lossless-video: $(FATE_LOSSLESS_VIDEO)

diff --cc tests/ref/fate/cllc-argb
index 7d09fba,0283863..4a5dce5
--- 1/tests/ref/fate/cllc-argb
--- 2/tests/ref/fate/cllc-argb
+++ b/tests/ref/fate/cllc-argb
@@@ -3,4 -3,3 +3,4 @@@
  0,          1,          1,        1,  3686400, 0x66a45032
  0,          2,          2,        1,  3686400, 0xdf0c861f
  0,          3,          3,        1,  3686400, 0xa4a68cdb
- 0,          4,          4,        1,  3686400, 0xc9b14908
++0,          4,          4,        1,  3686400, 0xb5f9526e