Statistics
| Branch: | Revision:

ffmpeg / cmdutils.h @ 3732c483

History | View | Annotate | Download (8.16 KB)

# Date Author Comment
707e8612 05/04/2011 02:06 AM Michael Niedermayer

Merge remote branch 'qatar/master'

  • qatar/master:
    Implement fate-rsync target
    Make ffmpeg support generic data stream

Conflicts:
cmdutils.h

Merged-by: Michael Niedermayer <>

e3b540b4 05/03/2011 09:51 AM Luca Barbato

Make ffmpeg support generic data stream

The patch is the first step to support -dcodec copy

0c55c6d3 03/26/2011 01:40 PM Stefano Sabatini

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...

2912e87a 03/19/2011 01:33 PM Mans Rullgard

Replace FFmpeg with Libav in licence headers

Signed-off-by: Mans Rullgard <>

76d4c167 03/08/2011 04:34 PM Benjamin Larsson

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 <>

76ad67ca 02/07/2011 06:32 PM Nicolas George

Implement guessed_pts in avcodec_decode_video2

Signed-off-by: Nicolas George <>
Signed-off-by: Michael Niedermayer <>

7a0e1be8 01/26/2011 02:43 AM Diego Elio Pettenò

Make this_year static to cmdutils.c

Signed-off-by: Mans Rullgard <>
(cherry picked from commit 3568853f63e1ab8ff1fc0773a132d14187a0e2d8)

3568853f 01/24/2011 11:44 PM Diego Elio Pettenò

Make this_year static to cmdutils.c

Signed-off-by: Mans Rullgard <>

6e872935 11/04/2010 11:07 PM Stefano Sabatini

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

ff0652e5 10/18/2010 01:57 PM Stefano Sabatini

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

f7ead94c 10/12/2010 06:40 PM Stefano Sabatini

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

a5c33faa 10/02/2010 08:44 AM Reimar Döffinger

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

0093ebc2 09/29/2010 11:06 PM Michael Niedermayer

User application side of Codec specific parameters.

Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk

f03f30d7 09/28/2010 02:49 PM Stefano Sabatini

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

7a8bfa5d 09/28/2010 02:05 AM Alexander Strange

Extract timestamp correction code from ffplay.c to cmdutils.c

Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk

1790d3b3 09/20/2010 09:48 PM Stefano Sabatini

Move log_callback_help to cmdutils.[hc], for allowing sharing.

Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk

0baf34d8 07/02/2010 12:48 PM Diego Biurrun

Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.

Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk

48966b02 07/02/2010 12:03 AM Måns Rullgård

Grammar fixes

Originally committed as revision 23961 to svn://svn.ffmpeg.org/ffmpeg/trunk

49bd8e4b 06/30/2010 03:38 PM Måns Rullgård

Fix grammar errors in documentation

Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk

8d787f8e 05/07/2010 12:42 PM Stefano Sabatini

Document cmdutils.c:print_error().

Originally committed as revision 23051 to svn://svn.ffmpeg.org/ffmpeg/trunk

458b062d 04/01/2010 10:34 PM Stefano Sabatini

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

72415b2a 03/30/2010 11:30 PM Stefano Sabatini

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

ffcc6e24 01/20/2010 06:42 AM Måns Rullgård

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...

3f7bb426 12/21/2009 09:53 PM Stefano Sabatini

Implement a -pix_fmts option for listing all the supported pixel
formats.

Originally committed as revision 20909 to svn://svn.ffmpeg.org/ffmpeg/trunk

c5dc6026 12/12/2009 05:45 PM Stefano Sabatini

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

62d75662 12/12/2009 04:18 PM Stefano Sabatini

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

8447f0bd 11/19/2009 04:35 PM Michael Niedermayer

Split show_formats().

Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk

4c97a6fa 06/16/2009 11:09 PM Stefano Sabatini

Move opt_loglevel() from ffmpeg.c to cmdutils.c.

Originally committed as revision 19209 to svn://svn.ffmpeg.org/ffmpeg/trunk

bf7e799c 06/06/2009 09:35 AM Stefano Sabatini

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

090b61b2 03/18/2009 09:35 PM Stefano Sabatini

Implement read_yesno().

Originally committed as revision 18037 to svn://svn.ffmpeg.org/ffmpeg/trunk

636f1c4c 03/03/2009 11:32 PM Stefano Sabatini

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

b7438896 02/19/2009 12:14 AM Stefano Sabatini

Fix typo: explixitly -> explicitly.

Originally committed as revision 17444 to svn://svn.ffmpeg.org/ffmpeg/trunk

ef4c0bb1 01/18/2009 09:40 PM Stefano Sabatini

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

95137bbb 10/04/2008 11:20 AM Diego Biurrun

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

85663ef3 09/28/2008 07:35 PM Michael Niedermayer

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

ea9c581f 05/29/2008 08:48 AM Stefano Sabatini

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

41a0df9b 05/27/2008 09:59 AM Stefano Sabatini

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

ba9880c1 05/22/2008 12:55 PM Stefano Sabatini

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

64555bd9 05/21/2008 11:36 PM Michael Niedermayer

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

a0b3bcd9 05/21/2008 11:27 PM Michael Niedermayer

OPT_EXIT

Originally committed as revision 13231 to svn://svn.ffmpeg.org/ffmpeg/trunk

748061de 04/17/2008 07:32 AM Stefano Sabatini

Typo
Patch by Stefano Sabatini stefano sabatini-lala poste it

Originally committed as revision 12877 to svn://svn.ffmpeg.org/ffmpeg/trunk

7542157d 03/31/2008 10:01 AM Stefano Sabatini

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

15067504 02/25/2008 03:36 PM Diego Biurrun

Improve wording/grammar of Doxygen comments.

Originally committed as revision 12215 to svn://svn.ffmpeg.org/ffmpeg/trunk

60b5a745 02/25/2008 02:05 PM Stefano Sabatini

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

f0a838e5 11/24/2007 10:08 AM Diego Biurrun

Add missing #includes to fix 'make checkheaders'.

Originally committed as revision 11087 to svn://svn.ffmpeg.org/ffmpeg/trunk

5b21bdab 10/17/2007 09:37 AM Diego Biurrun

Add FFMPEG_ prefix to all multiple inclusion guards.

Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk

ca34b9e6 10/17/2007 09:26 AM Diego Biurrun

Use filename as multiple inclusion guard.

Originally committed as revision 10762 to svn://svn.ffmpeg.org/ffmpeg/trunk

86074ed1 09/27/2007 06:38 AM Stefano Sabatini

Implement common show version and banner.
Patch by Stefano Sabatini [stefano sabatini-lala poste it]

Originally committed as revision 10600 to svn://svn.ffmpeg.org/ffmpeg/trunk

57b499c7 08/22/2007 12:41 PM Diego Biurrun

Identifiers starting with underscores are reserved.

Originally committed as revision 10179 to svn://svn.ffmpeg.org/ffmpeg/trunk

f35917b2 08/20/2007 08:09 AM Stefano Sabatini

Implement the cmdutils.c show_license function.
patch by Stefano Sabatini: [stefano sabatini-lala /\ poste it]

Originally committed as revision 10149 to svn://svn.ffmpeg.org/ffmpeg/trunk

60a9966e 08/13/2007 11:03 PM Stefano Sabatini

Make cmdutils.c:parse_options accept as argument a function to parse
bare command line parameters.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 10112 to svn://svn.ffmpeg.org/ffmpeg/trunk

ffdf9a1f 03/30/2007 09:43 AM Baptiste Coudurier

add OPT_INT64 option

Originally committed as revision 8554 to svn://svn.ffmpeg.org/ffmpeg/trunk

f5a90186 02/27/2007 04:05 PM Diego Biurrun

Add missing license headers.

Originally committed as revision 8149 to svn://svn.ffmpeg.org/ffmpeg/trunk

8bbf6db9 09/11/2005 11:10 AM Michael Niedermayer

AVOption API improvments
support AVOptions for encoding in ffmpeg.c

Originally committed as revision 4580 to svn://svn.ffmpeg.org/ffmpeg/trunk

ae27975d 06/03/2005 02:07 PM Fabrice Bellard

subtitle option

Originally committed as revision 4350 to svn://svn.ffmpeg.org/ffmpeg/trunk

394c4d77 10/16/2004 11:44 PM Michael Niedermayer

1000l (copy & paste)

Originally committed as revision 3603 to svn://svn.ffmpeg.org/ffmpeg/trunk

1f631450 10/16/2004 08:30 PM Michael Niedermayer

OPT_FLOAT

Originally committed as revision 3601 to svn://svn.ffmpeg.org/ffmpeg/trunk

26d4f26b 04/30/2004 01:41 PM Michael Niedermayer

OPT_INT

Originally committed as revision 3092 to svn://svn.ffmpeg.org/ffmpeg/trunk

02d504a7 08/24/2003 03:29 PM Fabrice Bellard

more sections in help - copyright fixes

Originally committed as revision 2143 to svn://svn.ffmpeg.org/ffmpeg/trunk

01310af2 06/07/2003 06:34 PM Fabrice Bellard

added ffplay utility

Originally committed as revision 1936 to svn://svn.ffmpeg.org/ffmpeg/trunk