summaryrefslogtreecommitdiff
path: root/cmdutils.h
Commit message (Collapse)AuthorAge
...
* | cmdutils: change the signature of the function argument in parse_options()Stefano Sabatini2011-06-05
| | | | | | | | This is required for a pending simplification.
* | cmdutils: move "#undef main" from ffplay.c to cmdutils.hCarl Eugen Hoyos2011-06-03
| | | | | | | | | | | | | | | | | | | | | | On Windows/MinGW the SDL cflags re-define the main() function, which results in a linking error if the define is not undeffed. Since the addition of the SDL output device, SDL cflags are used also for compiling ffmpeg and ffprobe, so we need to move this trick from ffplay.c to a common header. Fix trac issue #256.
* | cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-28
| | | | | | | | | | | | | | 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.
* | preset dir for win32Gianluigi Tiesi2011-05-21
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | This early morning merge should fix --disable-yasm * qatar/master: Clean up #includes in cmdutils.h. g729: Merge g729.h into g729dec.c. 10l: wrap float_interleave functions in HAVE_YASM. Conflicts: libavcodec/g729.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Clean up #includes in cmdutils.h.Diego Biurrun2011-05-19
| | | | | | | | | | | | 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.
| * cmdutils: remove list_fmts(), simplifyStefano Sabatini2011-05-10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-04
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: Implement fate-rsync target Make ffmpeg support generic data stream Conflicts: cmdutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Make ffmpeg support generic data streamLuca Barbato2011-05-03
| | | | | | | | The patch is the first step to support -dcodec copy
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make this_year static to cmdutils.cDiego Elio Pettenò2011-01-24
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | cmdutils: remove list_fmts(), simplifyStefano Sabatini2011-03-26
| | | | | | | | | | | | | | | | | | | | | | 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)’
* | Add a dummy option -i to ffplay so that it is easy to switch between ffmpeg ↵Benjamin Larsson2011-03-08
| | | | | | | | | | | | -i "file" and ffplay -i "file". Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Implement guessed_pts in avcodec_decode_video2Nicolas George2011-02-07
| | | | | | | | | | Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Make this_year static to cmdutils.cDiego Elio Pettenò2011-01-26
|/ | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 3568853f63e1ab8ff1fc0773a132d14187a0e2d8)
* Implement get_preset_file() in cmdutils.h and use it to factorize codeStefano Sabatini2010-11-04
| | | | | | from ffmpeg.c and ffserver.c. Originally committed as revision 25679 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement a common get_filtered_video_frame(), shared between ffplay.cStefano Sabatini2010-10-18
| | | | | | and ffmpeg.c. Originally committed as revision 25520 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize definition of the output_filter defined in both ffplay.c andStefano Sabatini2010-10-12
| | | | | | | 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
* Add init and uninit functions to cmdutils, reduces code duplicationReimar Döffinger2010-10-02
| | | | | | | 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
* User application side of Codec specific parameters.Michael Niedermayer2010-09-29
| | | | Originally committed as revision 25266 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make new doxy follows the agreed upon style and grammaticalStefano Sabatini2010-09-28
| | | | | | conventions, for consistency with the rest of the documentation. Originally committed as revision 25246 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Extract timestamp correction code from ffplay.c to cmdutils.cAlexander Strange2010-09-28
| | | | Originally committed as revision 25241 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move log_callback_help to cmdutils.[hc], for allowing sharing.Stefano Sabatini2010-09-20
| | | | Originally committed as revision 25149 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove angular brackets from Doxygen comments; Doxygen confuses them for HTML.Diego Biurrun2010-07-02
| | | | Originally committed as revision 23991 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Grammar fixesMåns Rullgård2010-07-02
| | | | Originally committed as revision 23961 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Document cmdutils.c:print_error().Stefano Sabatini2010-05-07
| | | | Originally committed as revision 23051 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement cmdutils.c:read_file(), and use it in ffmpeg.c for readingStefano Sabatini2010-04-01
| | | | | | the second pass encoding log file. Originally committed as revision 22769 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add -timelimit optionMåns Rullgård2010-01-20
| | | | | | | | | | | | | 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
* Implement a -pix_fmts option for listing all the supported pixelStefano Sabatini2009-12-21
| | | | | | formats. Originally committed as revision 20909 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move list_fmts() from ffmpeg.c to cmdutils.{h,c}, so that it can beStefano Sabatini2009-12-12
| | | | | | shared by the other ff* tools code. Originally committed as revision 20812 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement a -filters option, listing all the available libavfilterStefano Sabatini2009-12-12
| | | | | | | filters. Currently filters are not registered, so the option will show none. Originally committed as revision 20807 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Split show_formats().Michael Niedermayer2009-11-19
| | | | Originally committed as revision 20553 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move opt_loglevel() from ffmpeg.c to cmdutils.c.Stefano Sabatini2009-06-16
| | | | Originally committed as revision 19209 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove '\p', '\c' and '\e' doxygen markup from doxy, as it shouldStefano Sabatini2009-06-06
| | | | | | | | 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
* Implement read_yesno().Stefano Sabatini2009-03-18
| | | | Originally committed as revision 18037 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename avctx_opts to avcodec_opts.Stefano Sabatini2009-03-03
| | | | | | | 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
* Fix typo: explixitly -> explicitly.Stefano Sabatini2009-02-19
| | | | Originally committed as revision 17444 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement a var for containing the current year number rather thanStefano Sabatini2009-01-18
| | | | | | hardcode it in the banner string. Originally committed as revision 16678 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix 'make checkheaders', based on a patch by Diego Pettenò, flameeyes gmail ↵Diego Biurrun2008-10-04
| | | | | | com. Originally committed as revision 15552 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move opt_default() and set_context_opts() to cmdutils so it can be used fromMichael Niedermayer2008-09-28
| | | | | | the other tools as well. Originally committed as revision 15450 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Simplify show_banner() so that it does not require arguments, similarStefano Sabatini2008-05-29
| | | | | | | 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
* Update documentation of show_version() to account for latest changes.Stefano Sabatini2008-05-27
| | | | | | patch by Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13463 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move show_formats() to cmdutils.c.Stefano Sabatini2008-05-22
| | | | | | Patch by: Stefano Sabatini, stefano.sabatini-lala poste it Originally committed as revision 13236 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not pass program_name as argument to show_version(), this allows someMichael Niedermayer2008-05-21
| | | | | | future simplifications. Originally committed as revision 13232 to svn://svn.ffmpeg.org/ffmpeg/trunk
* OPT_EXITMichael Niedermayer2008-05-21
| | | | Originally committed as revision 13231 to svn://svn.ffmpeg.org/ffmpeg/trunk
* TypoStefano Sabatini2008-04-17
| | | | | | Patch by Stefano Sabatini stefano sabatini-lala poste it Originally committed as revision 12877 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Export parse_time_or_die from ffmpeg.c to cmdutils.cStefano Sabatini2008-03-31
| | | | | | Patch by Stefano Sabatini (stefano sabatini-lala poste it) Originally committed as revision 12647 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Improve wording/grammar of Doxygen comments.Diego Biurrun2008-02-25
| | | | Originally committed as revision 12215 to svn://svn.ffmpeg.org/ffmpeg/trunk