eden-emu/FFmpeg
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'qatar/master'

Browse source 
* 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>
This commit is contained in:
Michael Niedermayer 2012-08-26 02:10:25 +02:00
commit c684cb29bc
5 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ffmpeg_opt.c
View file

@ -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;