har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,639 Commits 2 Branches 401 Tags
Commit Graph

335 Commits

Author SHA1 Message Date
Anton Khirnov
05bffc12c4 avconv: move audio_sample_fmt to options context. 
Also document it and replace undocumented and inconsistent
'-sample_fmt list' syntax with -sample_fmts.
 2011-09-11 17:29:55 +02:00
Anton Khirnov
6a11686dfc avconv: move audio_channels to the options context. 2011-09-10 15:25:57 +02:00
Anton Khirnov
2130981af3 avconv: move *_disable to options context. 2011-09-10 13:10:02 +02:00
Anton Khirnov
35c5d7d1ef avconv: remove -[vas]lang options. 
They are redundant, the same can be now accomplished with -metadata.
 2011-09-10 13:09:42 +02:00
Anton Khirnov
013887ebcd avconv: move codec tags to options context. 
Add a new -tag option, make -[vas]tag an alias for -tag:[vas]
 2011-09-10 13:03:54 +02:00
Anton Khirnov
a2a38d9665 avconv: fix parsing metadata specifiers. 
After 039267f192f335144d9251e6f05a1513dd1e8ef1, metadata specifiers are
passed without the leading ':'. Remove a ++ that didn't take this into
account.
 2011-09-05 12:11:10 +02:00
Anton Khirnov
dc26318c2d avconv: move mux_preload and mux_max_delay to options context 2011-09-05 11:18:15 +02:00
Anton Khirnov
d821cbe2ff avconv: move bitstream filters to options context. 
Change syntax -- -[vas]bsf are replaced by -bsf:[stream specifier], the
argument is now a comma-separated list of bitstream filters.
 2011-09-05 11:17:31 +02:00
Anton Khirnov
f480532822 avconv: move rate_emu to options context. 
Make it work properly with multiple input files.
 2011-09-05 11:17:07 +02:00
Anton Khirnov
96139b5e32 avconv: move max_frames to options context. 
Add a -frames option that uses generic stream specifiers, change
-[vad]frames into aliases to it.
 2011-09-05 11:16:46 +02:00
Anton Khirnov
039267f192 avconv: move metadata to options context. 
It is now possible to set metadata on streams and chapters.
 2011-09-05 11:16:02 +02:00
Anton Khirnov
33f75d72e6 avconv: move ts scale to options context. 2011-09-05 11:15:40 +02:00
Anton Khirnov
c5bb372e85 avconv: move chapter maps to options context. 2011-09-05 11:15:28 +02:00
Anton Khirnov
847529f84a avconv: move metadata maps to options context. 2011-09-05 11:15:17 +02:00
Anton Khirnov
35e6f8c174 avconv: move codec_names to options context. 2011-09-05 11:13:36 +02:00
Anton Khirnov
7041bb3b1a avconv: move format to options context 2011-09-04 13:12:00 +02:00
Anton Khirnov
13ccba50d4 avconv: move limit_filesize to options context 2011-09-04 13:12:00 +02:00
Anton Khirnov
6b779cccaa avconv: move start_time, recording_time and input_ts_offset to options context 2011-09-04 13:12:00 +02:00
Anton Khirnov
575ec4e17d avconv: add a context for options. 
Move stream maps to it.

Eventually all non-global options should be stored in it.
 2011-09-04 13:12:00 +02:00
Anton Khirnov
7cc8d6385a cmdutils: add support for caller-provided option context. 
This is the first step to removing the globals plague from avtools.
 2011-09-04 13:12:00 +02:00
Anton Khirnov
cac651c834 cmdutils: move grow_array() from avconv to cmdutils. 2011-09-04 13:12:00 +02:00
Anton Khirnov
dad09ff93f cmdutils: move exit_program() declaration to cmdutils from avconv 
Allows cmdutils to call each tool's own cleanup function.
 2011-09-04 13:12:00 +02:00
Anton Khirnov
20c21f8b75 cmdutils: get rid of dummy contexts for examining AVOptions. 
Replace it with newly introduced libavutil API.
 2011-09-03 20:58:15 +02:00
Michael Niedermayer
6248694861 avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660 
These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-09-01 11:04:13 +02:00
Anton Khirnov
2e2594ca5b avconv: remove -threads option. 
It's only shadowing the AVOption with the same name.
 2011-08-30 20:51:32 +02:00
Alex Converse
f593628e58 avconv: Replace raw picture frame swapping hack. 2011-08-30 10:12:22 -07:00
Anton Khirnov
c922816d31 avconv: remove stubs of crop* and pad* options 2011-08-29 06:22:10 +02:00
Anton Khirnov
ed5b13265e avconv: re-add nb_streams to InputFile. 
It was mistakenly removed in 2cf8355f98681bdd726b739008acd5483f82f8d7,
not taking into account that new streams might appear in av_read_frame()
that avconv doesn't know about.

Fixes bug 24.
 2011-08-29 06:22:07 +02:00
Diego Biurrun
0249478756 doxygen: fix wrong comment syntax, //< vs. ///< 2011-08-26 18:34:28 +02:00
Alex Converse
b9630bcf82 avconv: Replace goto redo on decode fail with continue. 
This checks for sigterm but otherwise is identical to the previous
behavior.
 2011-08-24 10:13:32 -07:00
Alex Converse
389e0a5a24 avconv: Remove dead store. 2011-08-24 10:13:32 -07:00
Alex Converse
6c7ee2f7db avconv: use av_clip_int16 for audio clipping 2011-08-23 09:53:23 -07:00
Nicolas George
bc8c50512f avconv: print the codecs names in the stream mapping. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-08-23 16:50:01 +02:00
Anton Khirnov
c74b44de08 avconv: move the avcodec_find_decoder() call to add_input_streams(). 
This makes the code simpler to understand, though it results in an
unnecessary call to avcodec_find_decoder() if the stream won't be
decoded.
 2011-08-23 16:50:01 +02:00
Alex Converse
eaf2d37acc avconv: Separate initialization from the main transcode loop. 2011-08-19 15:41:05 -07:00
Anton Khirnov
f60a6b5853 avconv: reset input_ts_offset between files. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:37:14 -07:00
Anton Khirnov
b62b5cb6fd avconv: call flush_encoders() from transcode() directly. 
And remove now pointless parameter.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:36:05 -07:00
Anton Khirnov
c093150849 avconv: fix broken indentation. 
Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:35:20 -07:00
Anton Khirnov
f21f294e05 avconv: rescue poor abused limit_filesize global. 
Keep a per-OutputFile instance of it, thus making -fs work with multiple
output files.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
 2011-08-19 15:34:24 -07:00
Alex Converse
e6d2b73784 avconv: Set error code before before jumping to fail. 2011-08-19 11:28:21 -07:00
Alex Converse
bb337b4fbc avconv: Fix spelling errors. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-18 22:29:41 +02:00
Anton Khirnov
6f1c66d526 avconv: save two levels of indentation in flush_encoders() 
By replacing
if (foo)
    <do stuff>

with
if (!foo)
    continue;
<do stuff>
 2011-08-18 11:22:12 +02:00
Anton Khirnov
4a4ce2e743 avconv: factor flushing encoders out of output_packet(). 2011-08-18 11:22:12 +02:00
Anton Khirnov
630902a1e1 avconv: factor out initializing input streams. 2011-08-18 11:22:12 +02:00
Anton Khirnov
ddf5ef0263 avconv: remove -intra option. 
It's equivalent to -g 0.
 2011-08-18 11:22:05 +02:00
Anton Khirnov
e922bbfa76 avconv: reset streamid_map between output files. 2011-08-18 08:49:32 +02:00
Anton Khirnov
c5ad2c2cc6 avconv: make timer_start a local var in transcode(). 2011-08-18 08:49:32 +02:00
Anton Khirnov
6494c001be avconv: cosmetics, move OutputStream. 
Allows us to get rid of forward InputStream declaration.
 2011-08-18 08:49:32 +02:00
Anton Khirnov
e659c51563 avconv: remove two unused macros. 2011-08-18 08:49:32 +02:00
Anton Khirnov
45f861283e avconv: reindent. 2011-08-17 20:01:12 +02:00