Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Aug 2012 00:10:25 +0000 (02:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 26 Aug 2012 00:34:24 +0000 (02:34 +0200)
commitc684cb29bc6e81b9b2973e826b6fec98f8bafe8c
tree9d639d03103bb07cb955becdd3713f8b300f6b8f
parent0c3a3b75d743602dfa207936862789e93327cfc7
parentdb70730291df74595873d41914d2ef398fb13364
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
libavcodec/cllc.c
libavcodec/x86/fft_mmx.asm
tests/fate/lossless-video.mak
tests/ref/fate/cllc-argb