aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/tscc2data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-26 02:10:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-26 02:34:24 +0200
commitc684cb29bc6e81b9b2973e826b6fec98f8bafe8c (patch)
tree9d639d03103bb07cb955becdd3713f8b300f6b8f /libavcodec/tscc2data.h
parent0c3a3b75d743602dfa207936862789e93327cfc7 (diff)
parentdb70730291df74595873d41914d2ef398fb13364 (diff)
downloadffmpeg-c684cb29bc6e81b9b2973e826b6fec98f8bafe8c.tar.gz
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>
Diffstat (limited to 'libavcodec/tscc2data.h')
0 files changed, 0 insertions, 0 deletions