Commit Graph

89 Commits

Author SHA1 Message Date
Måns Rullgård 58fe804a5a Get rid of ifdeffery for printing library versions and configurations
Originally committed as revision 21476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 12:58:22 +00:00
Måns Rullgård 9120e2cd3f Print config of each lib if different from that of ffmpeg/ffplay/ffserver
Originally committed as revision 21448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-25 03:48:15 +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 7a78bc85aa Update this_year value.
Originally committed as revision 20995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-01 15:07:35 +00:00
Diego Biurrun 786386280e Mark conditionally used variable as av_unused, fixes the warning:
cmdutils.c:576: warning: unused variable ‘filter’

Originally committed as revision 20943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-28 12:01:49 +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 c3c7832479 Factorize opt+1 out in parse_options(), simplify.
Originally committed as revision 20872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-14 23:47:22 +00:00
Stefano Sabatini 663c2edf5a Only list libavfilter filters if libavfilter has been enabled during
configuration.
Fix compilation if FFmpeg is not configured with --enable-avfilter.

Originally committed as revision 20813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-12 19:15:56 +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
Stefano Sabatini 2cb2d6f0f7 Make show_protocols() print one protocol per line.
Originally committed as revision 20568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-21 00:22:05 +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 2091b27b68 Make show_formats() print each bitstream filter on a separate line.
Improve readability of the output.

Originally committed as revision 20549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-18 22:27:23 +00:00
Diego Biurrun a3d7c19728 Improve compiler information code to print to the console on program startup.
Remove gcc-specific hacks and allow filling relevant information for non-gcc
compilers in configure.

Originally committed as revision 19963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 12:23:14 +00:00
Diego Biurrun 5c1f57ffdf Print compiler version and build date before configuration in console output.
Originally committed as revision 19962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 12:21:06 +00:00
William R. Zwicky 5a8597a00a Document the output of ffmpeg -formats.
Patch by William R. Zwicky, wrzwicky pobox com

Originally committed as revision 19610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-09 10:42:38 +00:00
Benoit Fouet b1d6e5e8ad Handle noX for OPT_BOOL X.
Originally committed as revision 19572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-03 09:24:39 +00:00
Carl Eugen Hoyos da4c2dab17 Remove superfluous const.
Originally committed as revision 19284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-27 10:26:27 +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
Diego Biurrun 9cad0e4ed8 Add configure option to upgrade (L)GPL to version 3.
Originally committed as revision 19116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-05 11:04:03 +00:00
Stefano Sabatini 3bf28f9d7f Factorize initial "printf(" and ");" in show_license().
Originally committed as revision 18950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-25 22:22:51 +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
Michael Niedermayer 6d4f53cbac Remove old scaler.
Originally committed as revision 17786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 22:51:30 +00:00
Ramiro Polla da2dc39e74 Revert part of r16593.
network.h should only be included when CONFIG_NETWORK is set.

Originally committed as revision 17009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-05 18:51:29 +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 ddda628e81 Remove pointless #if around header #includes.
Originally committed as revision 16593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 00:45:04 +00:00
Aurelien Jacobs b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Stefano Sabatini e329b6ec7a Bump year number.
Originally committed as revision 16406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-02 11:09:37 +00:00
Stefano Sabatini f16dd7e65a Remove calls to deprecated av_set_string2() with calls to
av_set_string3().

Originally committed as revision 16241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-19 22:29:30 +00:00
Stefano Sabatini 3749076c77 Fix weird indent.
Originally committed as revision 16200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 00:13:19 +00:00
Stefano Sabatini 5c3383e5b5 Fix opt_default(), making it exit immediately in case of an invalid
argument.
See the thread: "[PATCH] Fix opt_default()".

Originally committed as revision 16196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 23:21:33 +00:00
Diego Pettenò 2cd39dbf16 Include headers for optional libraries only when enabled.
Include the headers for libavfilter, libswscale and libpostproc when
they are enabled (and thus linked in).

Without this change, Sun Studio will fail to link FFmpeg since two
inline functions defined in avfilter.h will have undefined references
to non-inline libavfilter functions.

Originally committed as revision 15665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-22 10:36:34 +00:00
Diego Pettenò a14b362fc6 Use CONFIG_* macros in cmdutils.c for consistency.
Originally committed as revision 15626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-16 11:46:15 +00:00
Diego Pettenò 88b77ef1e0 Mark print_all_lib_versions() static in cmdutils.c . Patch by Diego Pettenò
Originally committed as revision 15547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 09:25:39 +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 1981deaf6b Make show_banner()/show_version() print the libpostproc version
numbers if enabled.

Originally committed as revision 15149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 18:02:46 +00:00
Stefano Sabatini e9df66a7af Cosmetics: vertical align in print_all_lib_versions().
Originally committed as revision 15032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 18:29:45 +00:00
Stefano Sabatini db6d50c754 Make show_version()/show_banner() print the libswscale versions if
enabled.

Originally committed as revision 15031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 18:25:14 +00:00
Stefano Sabatini 9a10927279 Make show_banner() and show_version() print both the compile-time and the
link-time/run-time libav* version numbers.

Originally committed as revision 14737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 20:08:37 +00:00
Diego Biurrun 7254edb5ba Replace call to deprecated avcodec_build() with avcodec_version().
Originally committed as revision 14521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 14:37:19 +00:00
Stefano Sabatini 304ba23a0b Print the program_name rather than always "FFmpeg" when showing the
commandline tools license.

Originally committed as revision 14141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-09 18:45:33 +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 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
Diego Biurrun 245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Ramiro Polla 0b705fa424 Compile network-related code conditionally.
Originally committed as revision 13076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 00:46:34 +00:00
Luca Barbato 18ec046026 Error message for EPROTONOSUPPORT, patch from prossATxvidDoTorg
Originally committed as revision 12679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:16:34 +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