summaryrefslogtreecommitdiff
path: root/cmdutils.h
Commit message (Collapse)AuthorAge
...
| * cmdutils: allow storing per-stream/chapter/.... options in a generic wayAnton Khirnov2011-09-04
| |
| * cmdutils: split per-option code out of parse_options().Anton Khirnov2011-09-04
| | | | | | | | | | This allows options like -target, which are just shortcuts for other options, to work without dummy function for all options they invoke.
| * cmdutils: add support for caller-provided option context.Anton Khirnov2011-09-04
| | | | | | | | This is the first step to removing the globals plague from avtools.
| * cmdutils: declare only one pointer type in OptionDefAnton Khirnov2011-09-04
| | | | | | | | This will be useful in the following commit.
| * cmdutils: move grow_array() from avconv to cmdutils.Anton Khirnov2011-09-04
| |
| * cmdutils: move exit_program() declaration to cmdutils from avconvAnton Khirnov2011-09-04
| | | | | | | | Allows cmdutils to call each tool's own cleanup function.
* | Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'Michael Niedermayer2011-08-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2c087871dafc7d030b2d48457ddff597dfd4925': Move x86util.asm from libavcodec/ to libavutil/. Move x86inc.asm to libavutil/. APIchanges: note error_recognition in lavf lavf: add support for error_recognition, use it in avidec, and bump minor API version avconv: change semantics of -map avconv: get rid of new* options. cmdutils: allow precisely specifying a stream for AVOptions. configure: add missing CFLAGS to fix building on the HURD libx264: Include hint for possible values for configuring libx264 cmdutils: allow ':'-separated modifiers in option names. avconv: make -map_metadata work consistently with the other options avconv: remove deprecated options. avconv: make -map_chapters accept only the input file index. Make a copy of ffmpeg under a new name -- avconv. ffmpeg: add a warning stating that the program is deprecated. Add weighted motion compensation for RV40 B-frames RV3/4: calculate B-frame motion weights once per frame Move RV3/4-specific DSP functions into their own context mjpeg: propagate decode errors from ff_mjpeg_decode_sos and ff_mjpeg_decode_dqt h264: notice memory allocation failure Conflicts: .gitignore Makefile cmdutils.c configure doc/ffplay.texi doc/ffprobe.texi doc/ffserver.texi libavcodec/libx264.c libavformat/avformat.h libavformat/avidec.c libavformat/version.h tests/lavf-regression.sh tests/lavfi-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: allow precisely specifying a stream for AVOptions.Anton Khirnov2011-08-12
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h263dec: Propagate AV_LOG_ERRORs from slice decoding through frame decoding with sufficient error recognition x86: cabac: don't load/store context values in asm H.264: optimize CABAC x86 asm for Atom vp3/theora: flush after seek. doc/fftools-common-opts: wording fixes missing from the previous commit. doc: document using AVOptions in fftools. cmdutils: add codec_opts parameter to setup_find_stream_info_opts() cmdutils: clarify documentation for filter_codec_opts() cmdutils: clarify documentation for setup_find_stream_info_opts() lavf: add forgotten attribute_deprecated to av_find_stream_info() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add codec_opts parameter to setup_find_stream_info_opts()Stefano Sabatini2011-07-28
| | | | | | | | | | | | Avoid brittle and obfuscating reference to a global. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cmdutils: clarify documentation for filter_codec_opts()Stefano Sabatini2011-07-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * cmdutils: clarify documentation for setup_find_stream_info_opts()Stefano Sabatini2011-07-28
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in missing hashes and dates. Add an APIChanges entry and bump minor versions for recent changes. ffmpeg: print the low bitrate warning after the codec is openend. doxygen: Move function documentation into the macro generating the function. doxygen: Make sure parameter names match between .c and .h files. h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h H.264: Add more x86 assembly for 10-bit H.264 predict functions lavf: fix invalid reads in avformat_find_stream_info() cmdutils: replace opt_default with opt_default2() and remove set_context_opts ffmpeg: use new avcodec_open2 and avformat_find_stream_info API. ffplay: use new avcodec_open2 and avformat_find_stream_info API. cmdutils: store all codec options in one dict instead of video/audio/sub ffmpeg: check experimental flag after codec is opened. ffmpeg: do not set GLOBAL_HEADER flag in the options context Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c libavcodec/version.h libavformat/version.h libswscale/swscale_unscaled.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: replace opt_default with opt_default2() and remove set_context_optsAnton Khirnov2011-07-13
| |
| * ffplay: use new avcodec_open2 and avformat_find_stream_info API.Anton Khirnov2011-07-13
| |
| * cmdutils: store all codec options in one dict instead of video/audio/subAnton Khirnov2011-07-13
| | | | | | | | Split them when codec id is known.
* | Make all option parsing functions match the function pointer type through ↵Jeff Downs2011-06-30
| | | | | | | | | | | | | | | | | | which they are called. All option parsing functions now match the function pointer signature through which they are called (int f(const char *, const char *), thereby working reliably on all platforms. Prefix all option processing functions with opt_
* | lavfi: add vsink_buffer, and use it in ff* toolsStefano Sabatini2011-06-19
| | | | | | | | Also add the public interface libavfilter/vsink_buffer.h.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add opt_default2().Anton Khirnov2011-06-16
| | | | | | | | | | | | 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.
| * 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. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * multiple inclusion guard cleanupDiego Biurrun2011-05-21
| | | | | | | | | | Add missing multiple inclusion guards; clean up #endif comments; add missing library prefixes; keep guard names consistent.
* | cmdutils: remove unnecessary OPT_DUMMY implementationStefano Sabatini2011-06-05
| | | | | | | | | | | | The -i INPUT option can be implemented more cleanly by using a function option, which can easily be done now that the parse_arg_function passed to parse_options has a standard signature.
* | 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