Martin Storsjö
02170990fd
cmdutils: Rename read_file to cmdutils_read_file
...
This symbol name clashes with a symbol in gnutls, if linking
statically to that library.
Signed-off-by: Martin Storsjö <martin@martin.st>
13 years ago
Michael Niedermayer
90705aabe1
cmdutils.h: Project name cleanup
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
e9adeeec98
cmdutils: Fix loglevel for -debug
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Anton Khirnov
7a6cd9957d
cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
13 years ago
Diego Biurrun
25c27f379f
doc: fix references to obsolete presets directories for avconv/ffmpeg
13 years ago
Anton Khirnov
182cbe433a
avtools: parse loglevel before all the other options.
...
This way it can be applied to cmdutils too -- e.g. showing the banner
and printing startup messages.
13 years ago
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.
13 years ago
Anton Khirnov
33f75d72e6
avconv: move ts scale to options context.
13 years ago
Anton Khirnov
6b779cccaa
avconv: move start_time, recording_time and input_ts_offset to options context
13 years ago
Anton Khirnov
6361c5e1e6
cmdutils: allow storing per-stream/chapter/.... options in a generic way
13 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.
13 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.
13 years ago
Anton Khirnov
7efe05ab29
cmdutils: declare only one pointer type in OptionDef
...
This will be useful in the following commit.
13 years ago
Anton Khirnov
cac651c834
cmdutils: move grow_array() from avconv to cmdutils.
13 years ago
Anton Khirnov
dad09ff93f
cmdutils: move exit_program() declaration to cmdutils from avconv
...
Allows cmdutils to call each tool's own cleanup function.
13 years ago
Anton Khirnov
d4863fc1a8
cmdutils: allow precisely specifying a stream for AVOptions.
13 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
Stefano Sabatini
ce23ca814b
cmdutils: clarify documentation for filter_codec_opts()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Stefano Sabatini
7cea06d135
cmdutils: clarify documentation for setup_find_stream_info_opts()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
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
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
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
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
Carl Eugen Hoyos
25c32d082b
cmdutils: move "#undef main" from ffplay.c to cmdutils.h
...
On Windows/MinGW the SDL cflags re-define the main() function, which
results in a linking error if the define is not undeffed.
Since the addition of the SDL output device, SDL cflags are used also
for compiling ffmpeg and ffprobe, so we need to move this trick from
ffplay.c to a common header.
Fix trac issue #256 .
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
Diego Biurrun
153382e1b6
multiple inclusion guard cleanup
...
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
14 years ago
Gianluigi Tiesi
1b30e4f586
preset dir for win32
14 years ago
Diego Biurrun
ea91e77127
Clean up #includes in cmdutils.h.
...
inttypes.h is not necessary, just stdint.h is enough.
Unconditionally #include avfilter.h in cmdutils.h. It is an installed
header with no non-standard external dependencies, so it is safe.
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
Luca Barbato
e3b540b424
Make ffmpeg support generic data stream
...
The patch is the first step to support -dcodec copy
14 years ago
Stefano Sabatini
0c55c6d30e
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().
Als 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)’
14 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Benjamin Larsson
76d4c1676f
Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg -i "file" and ffplay -i "file".
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Nicolas George
76ad67cae7
Implement guessed_pts in avcodec_decode_video2
...
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
14 years ago
Diego Elio Pettenò
7a0e1be839
Make this_year static to cmdutils.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3568853f63
)
14 years ago
Diego Elio Pettenò
3568853f63
Make this_year static to cmdutils.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Stefano Sabatini
6e872935db
Implement get_preset_file() in cmdutils.h and use it to factorize code
...
from ffmpeg.c and ffserver.c.
Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Stefano Sabatini
ff0652e503
Implement a common get_filtered_video_frame(), shared between ffplay.c
...
and ffmpeg.c.
Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Stefano Sabatini
f7ead94c69
Factorize definition of the output_filter defined in both ffplay.c and
...
ffmpeg.c.
Replace it with a more generic definition which can be shared.
Originally committed as revision 25453 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Reimar Döffinger
a5c33faacc
Add init and uninit functions to cmdutils, reduces code duplication
...
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.
Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Michael Niedermayer
0093ebc20a
User application side of Codec specific parameters.
...
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Stefano Sabatini
f03f30d77a
Make new doxy follows the agreed upon style and grammatical
...
conventions, for consistency with the rest of the documentation.
Originally committed as revision 25246 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Alexander Strange
7a8bfa5d67
Extract timestamp correction code from ffplay.c to cmdutils.c
...
Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Stefano Sabatini
1790d3b330
Move log_callback_help to cmdutils.[hc], for allowing sharing.
...
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Diego Biurrun
0baf34d844
Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.
...
Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago