summaryrefslogtreecommitdiff
path: root/cmdutils.c
Commit message (Collapse)AuthorAge
* preset dir for win32Gianluigi Tiesi2011-05-21
|
* cmdutils: use const AVClass * when sensefulStefano Sabatini2011-05-20
| | | | | | | | | Fix warnings: cmdutils.c: In function ‘opt_default’: cmdutils.c:304: warning: initialization discards qualifiers from pointer target type cmdutils.c: In function ‘set_context_opts’: cmdutils.c:431: warning: passing argument 2 of ‘alloc_priv_context’ discards qualifiers from pointer target type cmdutils.c:414: note: expected ‘struct AVClass *’ but argument is of type ‘const struct AVClass *’
* cmdutils: reset *picref_ptr to NULL in get_filtered_frame()Stefano Sabatini2011-05-20
| | | | | Avoid the presence of an invalid pointer, fix a crash in case of get_filtered_frame() failure.
* cmdutils: Allocate private decoder context if its not allocated yet.Michael Niedermayer2011-05-16
| | | | | This fixes and simplifies setting decoder private options. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Allocate per codec options, now that options are freed between inputs and ↵Baptiste Coudurier2011-05-10
| | | | outputs.
* Merge remote branch 'qatar/master'Michael Niedermayer2011-05-10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegaudiodec: group #includes more sanely mpegaudio: remove #if 0 blocks ffmpeg.c: reset avoptions after each input/output file. ffmpeg.c: store per-output stream sws flags. mpegaudio: remove CONFIG_MPEGAUDIO_HP option mpegtsenc: Clear st->priv_data when freeing it udp: Fix receiving RTP data over multicast rtpproto: Remove an unused variable regtest: fix wma tests NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT regtest: separate flags for encoding and decoding Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg.c: reset avoptions after each input/output file.Anton Khirnov2011-05-09
| | | | | | | | This is consistent with how all the other options work.
| * lavfi: add key_frame and pict_type to AVFilterBufferRefVideo.Roger Pau Monné2011-04-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratioStefano Sabatini2011-05-01
| | | | | | | | | | | | | | | | | | Improve consistency with libavcodec. This breaks libavfilter API/ABI. The non-sequential 2.1.0 -> 2.4.0 bump is due to the mess previously done with the lavfi minor number.
* | lavc: add a sample_aspect_ratio field to AVFrameStefano Sabatini2011-05-01
| | | | | | | | | | | | | | The sample aspect ratio is a per-frame property, so it makes sense to define it in AVFrame rather than in the codec/stream context. Simplify application-level sample aspect ratio information extraction, and allow further simplifications.
* | lavc: add a pkt_pos field to AVFrameStefano Sabatini2011-05-01
| | | | | | | | | | | | This is similar to what was done with pkt_pts. This simplifies the operation of extracting the pos information from the AVPacket, and allows further simplifications.
* | FFMPEG: support demuxer specific options.Michael Niedermayer2011-04-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: graphparser: add a NULL check on the argument passed to strstr setdar: prefer "sar" over "par" in log info message fade: fix draw_slice() check on fade->factor value fade: make draw_slice() chroma check against planes 1 and 2 win32: include the correct header in cmdutils.c ac3: fix memleak in fixed-point encoder flashsv: Return more meaningful error values. flashsv: Employ explicit AVCodec struct initializers. read AVI palette from the end of extradata cosmetics: K&R coding style and more whitespace for Flash Screen Video Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * win32: include the correct header in cmdutils.cLuca Barbato2011-04-25
| | | | | | | | CommandLineToArgvW requires windows.h, include it directly
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Handle unicode file names on windows rtp: Rename the open/close functions to alloc/free Lowercase all ff* program names. Refer to ff* tools by their lowercase names. NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg. Replace `` by $() syntax in shell scripts. patcheck: Allow overiding grep program(s) through environment variables. NOT Pulled Remove stray libavcore and _g binary references. vorbis: Rename decoder/encoder files to follow general file naming scheme. aacenc: Fix whitespace after last commit. cook: Fix small typo in av_log_ask_for_sample message. aacenc: Finish 3GPP psymodel analysis for non mid/side cases. Remove RDFT dependency from AAC decoder. Add some debug log messages to AAC extradata Fix mov debug (u)int64_t format strings. bswap: use native types for av_bwap16(). doc: FLV muxing is supported. applehttp: Handle AES-128 encrypted streams Add a protocol handler for AES CBC decryption with PKCS7 padding doc: Mention that DragonFly BSD requires __BSD_VISIBLE set Conflicts: ffplay.c ffprobe.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Handle unicode file names on windowsKirill Gavrilov2011-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | All file names should be in UTF-8 within libavformat. This is handled by mapping the open() function to an internal one in os_support.h for windows. fopen() could be overridden in the same way, but if that would be used from ffmpeg.c, it would add a dependency on an ff prefixed internal lavf function. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-19
| |
| * avio: deprecate av_protocol_next().Anton Khirnov2011-04-08
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Prefer codec specific options over global ones, allowing codecBaptiste Coudurier2011-04-19
| | | | | | | | to override global options.
* | In libx264 wrapper, add -preset and -tune optionsBaptiste Coudurier2011-04-16
| |
* | cmdutils: add OPT_INT check in parse_number_or_die()Stefano Sabatini2011-04-16
| | | | | | | | | | Check that the value passed for an OPT_INT option is an int, fail otherwise.
* | Add key_frame and pict_type to AVFilterBufferRefVideo.Roger Pau Monné2011-04-16
| |
* | 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)’
* | Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"Michael Niedermayer2011-03-17
| | | | | | | | This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.
* | Revert "use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*"Michael Niedermayer2011-03-17
| | | | | | | | This reverts commit a03be6e1ba4cbf9984b0bbdb674704bbb2da6713.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-17
|\| | | | | | | | | | | | | | | | | | | Conflicts: Changelog doc/APIchanges doc/optimization.txt libavformat/avio.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * use LIBAV_LICENSE and LIBAV_VERSION instead of FFMPEG_*Janne Grunau2011-03-16
| |
| * replace FFMPEG with LIBAV in FFMPEG_CONFIGURATIONJanne Grunau2011-03-16
| | | | | | | | also update the multiple inclusion guards in config.h|mak
| * Deprecate parse_date() in favor of av_parse_time().Stefano Sabatini2011-02-16
| | | | | | | | | | | | | | | | The new av_parse_time() is created in libavutil/parseutils.h, all the internal functions used by parse_date are moved to libavutil/parseutils.c and made static. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-15
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * cmdutils: fix codec-specific options from presetJames Zern2011-02-05
| | | | | | | | | | | | | | | | Using a preset file caused the address of a stack variable to be stored in opt_names/values. This change causes the strings to be dup'd then freed in uninit_opts. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * cmdutils: fix opt_values leakJames Zern2011-02-05
| | | | | | | | | | | | Add free to uninit_opts and relocate opt_names to same Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Make this_year static to cmdutils.cDiego Elio Pettenò2011-01-24
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * libavcodec minor version is > 99 so fix the formatingGeorgi Chorbadzhiyski2011-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libavcodec minor version is > 99 so when printing the library versions the output is a little bit broken: libavutil 50. 36. 0 / 50.36. 0 libavcore 0. 16. 1 / 0.16. 1 libavcodec 52.108. 0 / 52.108. 0 libavformat 52. 94. 0 / 52.94. 0 libavdevice 52. 2. 3 / 52. 2. 3 libavfilter 1. 74. 0 / 1.74. 0 libswscale 0. 12. 0 / 0.12. 0 Change the formating to look like this: libavutil 50. 36. 0 / 50. 36. 0 libavcore 0. 16. 1 / 0. 16. 1 libavcodec 52.108. 0 / 52.108. 0 libavformat 52. 94. 0 / 52. 94. 0 libavdevice 52. 2. 3 / 52. 2. 3 libavfilter 1. 74. 0 / 1. 74. 0 libswscale 0. 12. 0 / 0. 12. 0 Signed-off-by: Mans Rullgard <mans@mansr.com>
* | 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>
* | Deprecate parse_date() in favor of av_parse_time().Stefano Sabatini2011-02-18
| | | | | | | | | | | | | | | | | | The new av_parse_time() is created in libavutil/parseutils.h, all the internal functions used by parse_date are moved to libavutil/parseutils.c and made static. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit f6c7375a175ac649558aefab14f3895b2cb469aa)
* | Merge libavcore into libavutilReinhard Tartler2011-02-16
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | 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>
* | cmdutils: fix codec-specific options from presetJames Zern2011-02-06
| | | | | | | | | | | | | | | | | | Using a preset file caused the address of a stack variable to be stored in opt_names/values. This change causes the strings to be dup'd then freed in uninit_opts. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 60ff9de6ffa740e0df8c2a019c72e2d332b9788d)
* | cmdutils: fix opt_values leakJames Zern2011-02-06
| | | | | | | | | | | | | | Add free to uninit_opts and relocate opt_names to same Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 3a6a9cdf5b8e4c4514e483484ef1f57b07ee16f2)
* | 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)
* | libavcodec minor version is > 99 so fix the formatingGeorgi Chorbadzhiyski2011-01-21
|/ | | | | | | | | | | | | | | | | | | | | | | | | | libavcodec minor version is > 99 so when printing the library versions the output is a little bit broken: libavutil 50. 36. 0 / 50.36. 0 libavcore 0. 16. 1 / 0.16. 1 libavcodec 52.108. 0 / 52.108. 0 libavformat 52. 94. 0 / 52.94. 0 libavdevice 52. 2. 3 / 52. 2. 3 libavfilter 1. 74. 0 / 1.74. 0 libswscale 0. 12. 0 / 0.12. 0 Change the formating to look like this: libavutil 50. 36. 0 / 50. 36. 0 libavcore 0. 16. 1 / 0. 16. 1 libavcodec 52.108. 0 / 52.108. 0 libavformat 52. 94. 0 / 52. 94. 0 libavdevice 52. 2. 3 / 52. 2. 3 libavfilter 1. 74. 0 / 1. 74. 0 libswscale 0. 12. 0 / 0. 12. 0 Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit c0dd5653043ca57848dfa480d02d581c7eb1d710)
* Use INFINITY and NAN macros instead of 1/0 and 0/0Mans Rullgard2011-01-18
|
* Disable initialization of the swscale sws_opts context inStefano Sabatini2011-01-04
| | | | | | | | | cmdutils.c:init_opts(), in the case libswscale compilation is not enabled. Fix ffprobe and ffserver compilation with --disable-swscale. Originally committed as revision 26212 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ReindentMartin Storsjö2011-01-03
| | | | Originally committed as revision 26205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AVOption for muxers in ffmpeg.Anssi Hannula2011-01-02
| | | | | | Patch by Anssi Hannula, anssi d hannula d iki d fi Originally committed as revision 26199 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update current year to 2011. Happy New Year!Justin Ruggles2011-01-01
| | | | Originally committed as revision 26184 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing check on the existence of avcodec_opts[AVMEDIA_TYPE_X],Stefano Sabatini2010-11-22
| | | | | | fix crash in ffprobe. Originally committed as revision 25799 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 16:06:38 +0000