Anton Khirnov
33f75d72e6
avconv: move ts scale to options context.
14 years ago
Anton Khirnov
6b779cccaa
avconv: move start_time, recording_time and input_ts_offset to options context
14 years ago
Anton Khirnov
6361c5e1e6
cmdutils: allow storing per-stream/chapter/.... options in a generic way
14 years ago
Anton Khirnov
2f8e586df1
cmdutils: split per-option code out of parse_options().
...
This allows options like -target, which are just shortcuts for other
options, to work without dummy function for all options they invoke.
14 years ago
Anton Khirnov
7cc8d6385a
cmdutils: add support for caller-provided option context.
...
This is the first step to removing the globals plague from avtools.
14 years ago
Anton Khirnov
7efe05ab29
cmdutils: declare only one pointer type in OptionDef
...
This will be useful in the following commit.
14 years ago
Anton Khirnov
cac651c834
cmdutils: move grow_array() from avconv to cmdutils.
14 years ago
Anton Khirnov
dad09ff93f
cmdutils: move exit_program() declaration to cmdutils from avconv
...
Allows cmdutils to call each tool's own cleanup function.
14 years ago
Anton Khirnov
20c21f8b75
cmdutils: get rid of dummy contexts for examining AVOptions.
...
Replace it with newly introduced libavutil API.
14 years ago
Michael Niedermayer
3d15853839
cmdutils: revert avconv rename of pathes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Clément Bœsch
0baf651bc1
cmdutils: fix uninitialized variable (type) warning.
14 years ago
Anton Khirnov
d4863fc1a8
cmdutils: allow precisely specifying a stream for AVOptions.
14 years ago
Anton Khirnov
d70e512250
cmdutils: allow ':'-separated modifiers in option names.
14 years ago
Anton Khirnov
6291d7e416
Make a copy of ffmpeg under a new name -- avconv.
...
It will be further developed with a few incompatible changes.
ffmpeg.c will stay as is for some time, so any scripts using it won't be
broken.
14 years ago
Clément Bœsch
78da04384a
options: handle options with the same name in codecs and formats.
...
This will allow the incoming -timecode option to be handled in both
encoders (mpeg12enc in that case) and demuxers (dv, mxf, etc.).
14 years ago
Stefano Sabatini
8ec19f84e1
cmdutils: add codec_opts parameter to setup_find_stream_info_opts()
...
Avoid brittle and obfuscating reference to a global.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Michael Niedermayer
8bc3a4807e
cmdutils: remove #if 0-ed conflict marger trash that i forgot
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Anton Khirnov
35d2e4e5c3
cmdutils: replace opt_default with opt_default2() and remove set_context_opts
14 years ago
Anton Khirnov
3009f521f3
ffplay: use new avcodec_open2 and avformat_find_stream_info API.
14 years ago
Anton Khirnov
8c8eab8bfe
cmdutils: store all codec options in one dict instead of video/audio/sub
...
Split them when codec id is known.
14 years ago
Anton Khirnov
71a861cf40
lavc: make avcodec_alloc_context3 officially public.
...
Deprecate avcodec_alloc_context/2.
14 years ago
Etienne Buira
3db9002f36
cmdutils: fix an opt name/val swap in set_context_opts()
...
Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
14 years ago
Jeff Downs
a09918335f
Make all option parsing functions match the function pointer type through which they are called.
...
All option parsing functions now match the function pointer signature through
which they are called (int f(const char *, const char *), thereby working
reliably on all platforms.
Prefix all option processing functions with opt_
14 years ago
Jeff Downs
f6d28cf029
parse_options(): Avoid passing NULL as a string arg to fprintf
14 years ago
Michael Niedermayer
54dd50d14d
cmdutils: remove outcommented merge trash
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Stefano Sabatini
44f669e7bc
lavfi: add vsink_buffer, and use it in ff* tools
...
Also add the public interface libavfilter/vsink_buffer.h.
14 years ago
Anton Khirnov
9ba38229e5
cmdutils: add opt_default2().
...
It stores options in a dictionary to be passed to new open calls.
It will replace opt_default once all the pieces are in place.
14 years ago
Anton Khirnov
dc59ec5e79
AVOptions: add av_opt_find() as a replacement for av_find_opt.
14 years ago
Stefano Sabatini
de85935883
cmdutils: add missing NULL check in parse_options()
...
Fix ffplay -i FILE, which was recently broken.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Stefano Sabatini
b4af3cf347
cmdutils: remove unnecessary OPT_DUMMY implementation
...
The -i INPUT option can be implemented more cleanly by using a
function option, which can easily be done now that the
parse_arg_function passed to parse_options has a standard signature.
14 years ago
Stefano Sabatini
96f931adf7
cmdutils: change the signature of the function argument in parse_options()
...
This is required for a pending simplification.
14 years ago
Mans Rullgard
42abb9a80d
cmdutils: add missing const qualifier
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Stefano Sabatini
eb8bc57240
cmdutils: remove OPT_FUNC2
...
Make ff* tools only accept opt_* functions taking two arguments.
The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.
14 years ago
Stefano Sabatini
26513856d6
cmdutils: remove OPT_FUNC2
...
Make ff* tools only accept opt_* functions taking two arguments.
The distinction between functions with one and two arguments is quite
pointless. Simplify parse_options() code.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Ronald S. Bultje
faf8d3ddfa
cmdutils: use sws_freeContext() instead of av_freep().
...
av_freep(swsContext) will leak all memory potentially
allocated within the swsContext.
14 years ago
Gianluigi Tiesi
1b30e4f586
preset dir for win32
14 years ago
Stefano Sabatini
950b358997
cmdutils: use const AVClass * when senseful
...
Fix warnings:
cmdutils.c: In function ‘opt_default’:
cmdutils.c:304: warning: initialization discards qualifiers from pointer target type
cmdutils.c: In function ‘set_context_opts’:
cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type
cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’
14 years ago
Stefano Sabatini
0d65e0f8cb
cmdutils: reset *picref_ptr to NULL in get_filtered_frame()
...
Avoid the presence of an invalid pointer, fix a crash in case of
get_filtered_frame() failure.
14 years ago
Michael Niedermayer
5319f48a57
cmdutils: Allocate private decoder context if its not allocated yet.
...
This fixes and simplifies setting decoder private options.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Benjamin Larsson
91199cfe55
ffplay: add a dummy option -i so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file".
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Baptiste Coudurier
580fa76c5c
Allocate per codec options, now that options are freed between inputs and outputs.
14 years ago
Stefano Sabatini
3372ec327b
cmdutils: add OPT_INT check in parse_number_or_die()
...
Check that the value passed for an OPT_INT option is an int, fail
otherwise.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Stefano Sabatini
5d2c6f42d7
cmdutils: remove list_fmts(), simplify
...
The function was only used in opt_sample_fmt() for listing the sample
formats. Move list_fmts() functionality directly into
opt_sample_fmt().
Also fix the warning:
ffmpeg.c: In function ‘opt_audio_sample_fmt’:
ffmpeg.c:2877: warning: passing argument 1 of ‘list_fmts’ from incompatible pointer type
cmdutils.h:163: note: expected ‘void (*)(char *, int, int)’ but argument is of type ‘char * (*)(char *, int, enum AVSampleFormat)’
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Anton Khirnov
19615089a0
ffmpeg.c: reset avoptions after each input/output file.
...
This is consistent with how all the other options work.
14 years ago
Stefano Sabatini
35fe66abbc
lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio
...
Improve consistency with libavcodec.
This breaks libavfilter API/ABI.
The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously
done with the lavfi minor number.
14 years ago
Stefano Sabatini
77e9dee8ae
lavc: add a sample_aspect_ratio field to AVFrame
...
The sample aspect ratio is a per-frame property, so it makes sense to
define it in AVFrame rather than in the codec/stream context.
Simplify application-level sample aspect ratio information extraction,
and allow further simplifications.
14 years ago
Stefano Sabatini
1ba5727242
lavc: add a pkt_pos field to AVFrame
...
This is similar to what was done with pkt_pts. This simplifies the
operation of extracting the pos information from the AVPacket, and
allows further simplifications.
14 years ago
Michael Niedermayer
fa1195227f
FFMPEG: support demuxer specific options.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Roger Pau Monné
10d39405fa
lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Luca Barbato
ba9327ea65
win32: include the correct header in cmdutils.c
...
CommandLineToArgvW requires windows.h, include it directly
14 years ago