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>

ffmpeg_opt.c

@@ -72,7 +72,6 @@ int do_pkt_dump       = 0;
 int copy_ts           = 0;
 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;

libavcodec/cllc.c

@@ -284,7 +284,8 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
 
     /* Make sure our bswap16'd buffer is big enough */
     swapped_buf_new = av_fast_realloc(ctx->swapped_buf,
-                                      &ctx->swapped_buf_size, avpkt->size);
+                                      &ctx->swapped_buf_size, avpkt->size +
+                                      FF_INPUT_BUFFER_PADDING_SIZE);
     if (!swapped_buf_new) {
         av_log(avctx, AV_LOG_ERROR, "Could not realloc swapped buffer.\n");
         return AVERROR(ENOMEM);
@@ -313,6 +314,10 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
     ctx->dsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src,
                          (avpkt->size - info_offset) / 2);
 
+    /* Initialize padding to 0 */
+    memset(ctx->swapped_buf + avpkt->size - info_offset,
+           0, FF_INPUT_BUFFER_PADDING_SIZE);
+
     init_get_bits(&gb, ctx->swapped_buf, (avpkt->size - info_offset) * 8);
 
     /*

libavcodec/x86/fft_mmx.asm

@@ -792,14 +792,6 @@ fft %+ n %+ fullsuffix:
 
 align 8
 dispatch_tab %+ fullsuffix: pointer list_of_fft
-
-section .text
-
-; On x86_32, this function does the register saving and restoring for all of fft.
-; The others pass args in registers and don't spill anything.
-cglobal fft_dispatch%2, 2,5,8, zc, nbits
-    FFT_DISPATCH fullsuffix, nbits
-    RET
 %endmacro ; DECL_FFT
 
 %if HAVE_AVX

tests/fate/lossless-video.mak

@@ -1,3 +1,12 @@
+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
 
@@ -37,14 +46,5 @@ fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi
 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)

tests/ref/fate/cllc-argb

@@ -3,4 +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