707e8612e8
Merge remote branch 'qatar/master'
...
* qatar/master:
Implement fate-rsync target
Make ffmpeg support generic data stream
Conflicts:
cmdutils.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-04 04:06:26 +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
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)’
2011-03-26 14:40:30 +01: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
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>
2011-03-08 17:34:02 +01:00
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>
2011-02-07 19:32:07 +01:00
7a0e1be839
Make this_year static to cmdutils.c
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3568853f63
2011-01-26 03:43:29 +01: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
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
8447f0bd74
Split show_formats().
...
Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 16:35:55 +00:00
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
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
090b61b2d1
Implement read_yesno().
...
Originally committed as revision 18037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-18 21:35:49 +00:00
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
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
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
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
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
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
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
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
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
a0b3bcd9fe
OPT_EXIT
...
Originally committed as revision 13231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 23:27:50 +00:00
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
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
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
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
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
5b21bdabe4
Add FFMPEG_ prefix to all multiple inclusion guards.
...
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:37:46 +00:00
ca34b9e615
Use filename as multiple inclusion guard.
...
Originally committed as revision 10762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-17 09:26:21 +00:00
86074ed1b7
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
2007-09-27 06:38:40 +00:00
57b499c7da
Identifiers starting with underscores are reserved.
...
Originally committed as revision 10179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-22 12:41:16 +00:00
f35917b2f3
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
2007-08-20 08:09:51 +00:00
Michael Niedermayer
Luca Barbato
Stefano Sabatini
Mans Rullgard
Benjamin Larsson
Nicolas George
Diego Elio Pettenò
Reimar Döffinger
Alexander Strange
Diego Biurrun