diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-26 04:10:25 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-26 04:34:24 +0400 |
| commit | c684cb29bc6e81b9b2973e826b6fec98f8bafe8c (patch) | |
| tree | 9d639d03103bb07cb955becdd3713f8b300f6b8f /ffmpeg_opt.c | |
| parent | 0c3a3b75d743602dfa207936862789e93327cfc7 (diff) | |
| parent | db70730291df74595873d41914d2ef398fb13364 (diff) | |
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 'ffmpeg_opt.c')
| -rw-r--r-- | ffmpeg_opt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ffmpeg_opt.c b/ffmpeg_opt.c index 942d3b5802..7505ba9a5d 100644 --- a/ffmpeg_opt.c +++ b/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; |