ec554ee747
Read preset files with suffix .avpreset
...
The preset files have been renamed some time ago.
CC: libav-stable@libav.org
(cherry picked from commit 050dc12778
2012-04-29 22:07:01 +02:00
45f2908d02
cosmetics: Rename ffsink to avsink.
2012-01-19 00:19:43 +01:00
0184bbe2d1
avprobe, cmdutils: K&R formatting cosmetics
2012-01-18 21:07:25 +01:00
da9cea77e3
Fix a bunch of common typos.
2011-12-11 00:32:25 +01:00
e873c03ac7
misc Doxygen markup improvements
2011-12-05 13:06:58 +01:00
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>
2011-10-31 16:29:29 +02:00
7a6cd9957d
cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()
2011-10-12 16:51:17 +02:00
25c27f379f
doc: fix references to obsolete presets directories for avconv/ffmpeg
2011-10-11 14:31:19 +02:00
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.
2011-09-26 20:33:50 +02:00
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
33f75d72e6
avconv: move ts scale to options context.
2011-09-05 11:15:40 +02:00
6b779cccaa
avconv: move start_time, recording_time and input_ts_offset to options context
2011-09-04 13:12:00 +02:00
6361c5e1e6
cmdutils: allow storing per-stream/chapter/.... options in a generic way
2011-09-04 13:12:00 +02:00
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.
2011-09-04 13:12:00 +02:00
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
7efe05ab29
cmdutils: declare only one pointer type in OptionDef
...
This will be useful in the following commit.
2011-09-04 13:12:00 +02:00
cac651c834
cmdutils: move grow_array() from avconv to cmdutils.
2011-09-04 13:12:00 +02:00
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
d4863fc1a8
cmdutils: allow precisely specifying a stream for AVOptions.
2011-08-12 18:35:12 +02:00
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>
2011-07-28 17:13:14 +02:00
ce23ca814b
cmdutils: clarify documentation for filter_codec_opts()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-28 17:13:14 +02:00
7cea06d135
cmdutils: clarify documentation for setup_find_stream_info_opts()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-07-28 17:13:14 +02:00
35d2e4e5c3
cmdutils: replace opt_default with opt_default2() and remove set_context_opts
2011-07-13 23:17:42 +02:00
3009f521f3
ffplay: use new avcodec_open2 and avformat_find_stream_info API.
2011-07-13 23:17:42 +02:00
8c8eab8bfe
cmdutils: store all codec options in one dict instead of video/audio/sub
...
Split them when codec id is known.
2011-07-13 23:17:42 +02:00
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.
2011-06-16 20:24:57 +02:00
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>
2011-05-28 09:40:19 -04:00
153382e1b6
multiple inclusion guard cleanup
...
Add missing multiple inclusion guards; clean up #endif comments;
add missing library prefixes; keep guard names consistent.
2011-05-21 13:48:10 +02:00
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.
2011-05-19 10:23:53 +02:00
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>
2011-05-10 07:14:13 +02:00
e3b540b424
Make ffmpeg support generic data stream
...
The patch is the first step to support -dcodec copy
2011-05-03 11:51:55 +02:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
3568853f63
Make this_year static to cmdutils.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-24 23:44:58 +00:00
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
2010-11-04 23:07:04 +00:00
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
2010-10-18 13:57:11 +00:00
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
2010-10-12 18:40:26 +00:00
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
2010-10-02 08:44:33 +00:00
0093ebc20a
User application side of Codec specific parameters.
...
Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-29 23:06:51 +00:00
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
2010-09-28 14:49:55 +00:00
7a8bfa5d67
Extract timestamp correction code from ffplay.c to cmdutils.c
...
Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 02:05:12 +00:00
1790d3b330
Move log_callback_help to cmdutils.[hc], for allowing sharing.
...
Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-20 21:48:03 +00:00
0baf34d844
Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.
...
Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 12:48:32 +00:00
48966b02cb
Grammar fixes
...
Originally committed as revision 23961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 00:03:48 +00:00
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
8d787f8e52
Document cmdutils.c:print_error().
...
Originally committed as revision 23051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 12:42:26 +00:00
458b062d61
Implement cmdutils.c:read_file(), and use it in ffmpeg.c for reading
...
the second pass encoding log file.
Originally committed as revision 22769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-01 22:34:22 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
ffcc6e24f5
Add -timelimit option
...
This option limits the CPU time used by ffmpeg to the number of seconds
specified. After this time, the OS sends a SIGXCPU signal, which we
handle and attempt to exit cleanly. If the process is stuck, the OS
will deliver a SIGKILL one second later, forcibly terminating the
process.
This functionality is useful in automated setups where a runaway ffmpeg
process would otherwise go undetected.
Originally committed as revision 21347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 06:42:39 +00:00
3f7bb42607
Implement a -pix_fmts option for listing all the supported pixel
...
formats.
Originally committed as revision 20909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-21 21:53:03 +00:00
c5dc602600
Move list_fmts() from ffmpeg.c to cmdutils.{h,c}, so that it can be
...
shared by the other ff* tools code.
Originally committed as revision 20812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 17:45:20 +00:00
Reinhard Tartler
Diego Biurrun
Gaurav Narula
Martin Storsjö
Anton Khirnov
Stefano Sabatini
Luca Barbato
Mans Rullgard
Diego Elio Pettenò
Reimar Döffinger
Michael Niedermayer
Alexander Strange