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

115 Commits

Author SHA1 Message Date
Stefano Sabatini
ce23ca814b cmdutils: clarify documentation for filter_codec_opts() 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2011-07-28 17:13:14 +02:00
Stefano Sabatini
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
Anton Khirnov
35d2e4e5c3 cmdutils: replace opt_default with opt_default2() and remove set_context_opts 2011-07-13 23:17:42 +02:00
Anton Khirnov
3009f521f3 ffplay: use new avcodec_open2 and avformat_find_stream_info API. 2011-07-13 23:17:42 +02:00
Anton Khirnov
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
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.
 2011-06-16 20:24:57 +02:00
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>
 2011-05-28 09:40:19 -04:00
Diego Biurrun
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
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.
 2011-05-19 10:23:53 +02:00
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>
 2011-05-10 07:14:13 +02:00
Luca Barbato
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
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
3568853f63 Make this_year static to cmdutils.c 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-01-24 23:44:58 +00:00
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
 2010-11-04 23:07:04 +00:00
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
 2010-10-18 13:57:11 +00:00
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
 2010-10-12 18:40:26 +00:00
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
 2010-10-02 08:44:33 +00:00
Michael Niedermayer
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
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
 2010-09-28 14:49:55 +00:00
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
 2010-09-28 02:05:12 +00:00
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
 2010-09-20 21:48:03 +00:00
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
 2010-07-02 12:48:32 +00:00
Måns Rullgård
48966b02cb Grammar fixes 
Originally committed as revision 23961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 00:03:48 +00:00
Måns Rullgård
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
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
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
Måns Rullgård
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
Stefano Sabatini
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
Stefano Sabatini
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
Stefano Sabatini
62d7566239 Implement a -filters option, listing all the available libavfilter 
filters.
Currently filters are not registered, so the option will show none.

Originally committed as revision 20807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 16:18:11 +00:00
Michael Niedermayer
8447f0bd74 Split show_formats(). 
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-11-19 16:35:55 +00:00
Stefano Sabatini
4c97a6fafa Move opt_loglevel() from ffmpeg.c to cmdutils.c. 
Originally committed as revision 19209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-16 23:09:03 +00:00
Stefano Sabatini
bf7e799c9e Remove '\p', '\c' and '\e' doxygen markup from doxy, as it should 
improve plain text doxy readability.

See the thread: "[RFC] Should we use doxygen markup?".

Originally committed as revision 19122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-06 09:35:15 +00:00
Stefano Sabatini
090b61b2d1 Implement read_yesno(). 
Originally committed as revision 18037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-18 21:35:49 +00:00
Stefano Sabatini
636f1c4cd0 Rename avctx_opts to avcodec_opts. 
The new name is more meaningful and consistent with avformat_opts
and sws_opts.

Originally committed as revision 17789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-03 23:32:10 +00:00
Stefano Sabatini
b7438896b3 Fix typo: explixitly -> explicitly. 
Originally committed as revision 17444 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-19 00:14:41 +00:00
Stefano Sabatini
ef4c0bb1dc Implement a var for containing the current year number rather than 
hardcode it in the banner string.

Originally committed as revision 16678 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-18 21:40:26 +00:00
Diego Biurrun
95137bbbb4 Fix 'make checkheaders', based on a patch by Diego Pettenò, flameeyes gmail com. 
Originally committed as revision 15552 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-04 11:20:02 +00:00
Michael Niedermayer
85663ef302 Move opt_default() and set_context_opts() to cmdutils so it can be used from 
the other tools as well.

Originally committed as revision 15450 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-28 19:35:22 +00:00
Stefano Sabatini
ea9c581f61 Simplify show_banner() so that it does not require arguments, similar 
to what was previously done with show_version().
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-29 08:48:51 +00:00
Stefano Sabatini
41a0df9b81 Update documentation of show_version() to account for latest changes. 
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13463 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-27 09:59:00 +00:00
Stefano Sabatini
ba9880c13a Move show_formats() to cmdutils.c. 
Patch by: Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-22 12:55:35 +00:00
Michael Niedermayer
64555bd9b1 Do not pass program_name as argument to show_version(), this allows some 
future simplifications.

Originally committed as revision 13232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 23:36:32 +00:00
Michael Niedermayer
a0b3bcd9fe OPT_EXIT 
Originally committed as revision 13231 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-21 23:27:50 +00:00
Stefano Sabatini
748061de2f Typo 
Patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 12877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-04-17 07:32:38 +00:00
Stefano Sabatini
7542157d8a Export parse_time_or_die from ffmpeg.c to cmdutils.c 
Patch by Stefano Sabatini (stefano sabatini-lala poste it)

Originally committed as revision 12647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-31 10:01:06 +00:00
Diego Biurrun
15067504c8 Improve wording/grammar of Doxygen comments. 
Originally committed as revision 12215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 15:36:10 +00:00
Stefano Sabatini
60b5a745a9 Export and document in cmdutils.h the function parse_number_or_die(). 
Patch by Stefano Sabatini: stefano sabatini-lala poste it

Originally committed as revision 12210 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-25 14:05:52 +00:00
Diego Biurrun
f0a838e525 Add missing #includes to fix 'make checkheaders'. 
Originally committed as revision 11087 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-24 10:08:02 +00:00