1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/tests/ref
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
..
fate Merge remote-tracking branch 'qatar/master' 2012-08-26 02:34:24 +02:00
lavf ffmpeg: Do not discard slightly invalid timestamps. 2012-08-12 01:22:48 +02:00
lavf-fate
lavfi lavfi: add edgedetect filter. 2012-08-16 22:03:32 +02:00
seek lavf: move generic index generation code to a later point 2012-07-26 03:04:49 +02:00
vsynth1
vsynth2