summaryrefslogtreecommitdiff
path: root/cmdutils.c
Commit message (Collapse)AuthorAgeFilesLines
* cmdutils: improve feedback in case of not found optionStefano Sabatini2013-03-131-1/+4
|
* Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'Michael Niedermayer2013-03-121-0/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38': avconv: print an error on applying options of the wrong type. atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize output-example: Update to use encode_video2 instead of the now dropped encode_video Conflicts: doc/examples/muxing.c ffmpeg_opt.c libavutil/atomic.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: print an error on applying options of the wrong type.Anton Khirnov2013-03-081-0/+10
| | | | | | | | I.e. input options to output files or vice versa.
* | Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer2013-03-121-141/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit '354468fc12dcf93e7fb4af552e18906771913273': avplay: switch to new refcounted frames API avconv: convert to new refcounted AVFrame API Conflicts: cmdutils.c ffmpeg.c ffmpeg.h ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: switch to new refcounted frames APIAnton Khirnov2013-03-081-126/+0
| | | | | | | | Remove now unused cmdutils get_buffer() implementation.
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-071-1/+1
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
* | cmdutils: remove conditionnal pp include.Clément Bœsch2013-03-111-2/+0
| | | | | | | | | | The definition of the include are needed for builds even without pp. This should fix FATE with --disable-gpl after 63edd2f9.
* | cmdutils: clarify log message, in case of option routed to both codec and ↵Stefano Sabatini2013-03-101-1/+1
| | | | | | | | mux/demux layer
* | cmdutils: remove duplicated check on CONFIG_POSTPROCStefano Sabatini2013-03-101-2/+0
| | | | | | | | The check is already performed by the PRINT_LIB_INFO macro.
* | cmdutils: make print_all_libs_info() show libavresample versionStefano Sabatini2013-03-101-1/+1
| | | | | | | | | | Even if not directly supported by FFmpeg, it is still useful to see the linked version of libavresample.
* | cmdutils: fix stylenitsStefano Sabatini2013-03-101-2/+2
| |
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-031-1/+1
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'Michael Niedermayer2013-03-011-3/+1
|\ \ | |/ | | | | | | | | | | | | * commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a': cmdutils: Allow calling filter_codec_opts without a set encoder pnm: Use av_pix_fmt_desc_get instead of accessing the array directly Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Allow calling filter_codec_opts without a set encoderMartin Storsjö2013-02-281-3/+1
| | | | | | | | | | | | | | In this case, no encoder specific options are filtered, only options specific to that codec type in general. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'Michael Niedermayer2013-02-261-3/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e8da807537e314d74cb6d93598f1dcfb891fa655': cmdutils: only use libavresample when it is enabled libschroedinger: cosmetics: rename variable avccontext to avctx vorbisenc: cosmetics: rename variable avccontext to avctx Conflicts: cmdutils.c libavcodec/libschroedinger.c libavcodec/libschroedingerenc.c libavcodec/vorbisenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: only use libavresample when it is enabledJustin Ruggles2013-02-251-0/+4
| | | | | | | | avprobe and avserver use cmdutils and do not strictly require libavresample.
* | ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer2013-02-241-12/+9
| | | | | | | | | | | | | | This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: fix null pointer dereferenceMichael Niedermayer2013-02-241-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer2013-02-241-2/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit '5c7db097ebe1fb5c233cedd8846615074e7d6044': avconv: pass libavresample options to AVFilterGraph Conflicts: cmdutils.c cmdutils.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: pass libavresample options to AVFilterGraphJustin Ruggles2013-02-231-2/+10
| |
* | Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'Michael Niedermayer2013-02-161-5/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793': get_buffer(): do not initialize the data. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * get_buffer(): do not initialize the data.Anton Khirnov2013-02-151-5/+0
| | | | | | | | | | There may be more decoders that rely on this. Those should be found and fixed.
* | Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'Michael Niedermayer2013-02-061-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '89f11f498b9c15bc71494a11a7ec560f4adf630d': qtrle: fix the topmost line for 1bit Conflicts: tests/ref/fate/qtrle-1bit See: 1af91978dbab35ba9fdede187577c00d643ae33b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * qtrle: fix the topmost line for 1bitKostya Shishkov2013-02-061-1/+0
| | | | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net> CC:libav-stable@libav.org
* | Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'Michael Niedermayer2013-02-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '2cd4068071b9a8908823a3107f97e938211045ce': fraps: fix off-by one bug for version 1. Conflicts: libavcodec/fraps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * fraps: fix off-by one bug for version 1.Anton Khirnov2013-02-061-1/+1
| | | | | | | | CC:libav-stable@libav.org
* | Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'Michael Niedermayer2013-02-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177': aasc: fix output for msrle compression. msrledec: check bounds before constructing a possibly invalid pointer, cmdutils: remove ansi from the list of broken codecs. Conflicts: tests/ref/fate/aasc Also See: e7117f1c1058d41eb759d1613e849c29b15c85b5 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aasc: fix output for msrle compression.Anton Khirnov2013-02-061-1/+1
| | | | | | | | | | | | The bottom line was invalid before. CC:libav-stable@libav.org
| * cmdutils: remove ansi from the list of broken codecs.Anton Khirnov2013-02-061-1/+1
| | | | | | | | | | It's not relying on get_buffer() initializing the frame since 99e36ddd3ee57c38e6ca9e240ba518848487f849.
* | Merge commit '238614de679a71970c20d7c3fee08a322967ec40'Michael Niedermayer2013-02-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '238614de679a71970c20d7c3fee08a322967ec40': cdgraphics: do not rely on get_buffer() initializing the frame. svq1: replace struct svq1_frame_size with an array. vf_yadif: silence a warning. Conflicts: libavcodec/svq1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cdgraphics: do not rely on get_buffer() initializing the frame.Anton Khirnov2013-02-061-1/+1
| | | | | | | | | | Setting it to zero (instead of 128, as the default get_buffer() does) also produces more correctly-looking output.
| * cmdutils: update copyright year to 2013Johan Andersson2013-01-031-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | cmdline: fix -- to escape files starting with -Michael Niedermayer2013-01-191-1/+6
| | | | | | | | | | | | Fixes Ticket2127 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: we have 2013Michael Niedermayer2013-01-011-1/+1
| | | | | | | | | | Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer2012-12-201-13/+11
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011': cmdutils: pass number of groups to split_commandline(). mov: handle h263 and flv1 for codec_tag 'H','2','6','3' h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles Conflicts: libavcodec/h264_ps.c libavformat/isom.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: pass number of groups to split_commandline().Anton Khirnov2012-12-191-13/+11
| | | | | | | | | | This makes the code simpler and avoids mixing designated and non-designated initializers in a potentially unsafe way in avconv.
* | cmdutils: implement debug/fdebug log level update differently.Michael Niedermayer2012-12-201-6/+3
| | | | | | | | | | | | | | The old implementation is no longer possibly due to limitations of the new command line parser. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer2012-12-201-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'Michael Niedermayer2012-12-191-1/+0
|\ \ | |/ | | | | | | | | | | * commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a': cmdutils: don't log an error in opt_default(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: don't log an error in opt_default().Anton Khirnov2012-12-181-1/+0
| | | | | | | | It results in spurious errors when using the new preparser.
* | Merge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'Michael Niedermayer2012-12-191-0/+241
|\ \ | |/ | | | | | | | | | | * commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77': cmdutils: add a commandline pre-parser. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: add a commandline pre-parser.Anton Khirnov2012-12-181-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | It splits the commandline into a more convenient internal representation for further parsing. This will allow e.g. - processing global options first independently of their location on the commandline, eliminating ugly hacks for processing e.g. cpuflags first - better options validation and error reporting. It is now possible for the parser to know that it's applying an input option to an output file or vice versa and act accordingly.
* | Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'Michael Niedermayer2012-12-191-30/+40
|\ \ | |/ | | | | | | | | | | * commit 'a01c02bcff755a7891f777706b27452203aac71e': cmdutils: split parse_option(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: split parse_option().Anton Khirnov2012-12-181-30/+40
| | | | | | | | | | | | Separate the code that searches for the option to use and the code that actually writes it. The writing code will be reused by the new options parser.
* | lavu: make sure av_pix_fmt_desc_next returns a valid pix fmt.Clément Bœsch2012-12-161-2/+0
| | | | | | | | | | | | | | | | | | This is required because there are some "holes" in the list for compatibility with the fork. The commit also removes the now unecessary check from cmdutils. Found-by: wm4
* | Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'Michael Niedermayer2012-12-051-5/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'ff953fecffd3b9a616a046723fb9d4690be032a6': lavc: set frame properties in ff_get_buffer(). Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set frame properties in ff_get_buffer().Anton Khirnov2012-12-041-5/+0
| | | | | | | | | | There is no point in duplicating this code in every get_buffer() implementation.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-301-2/+2
|\ \ | |/ | | | | | | | | | | | | * qatar/master: avutil: Include io.h with a separate condition from MapViewOfFile cmdutils: Use a configure check for enabling CommandLineToArgvW Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Use a configure check for enabling CommandLineToArgvWMartin Storsjö2012-11-291-2/+2
| | | | | | | | | | | | | | | | | | This simplifies the condition to avoid hardcoding the systems where the function exists. This also simplifies support for newer Windows API subsets where this function doesn't exist, such as Windows Phone 8 and the "metro" API subset of Windows 8. Signed-off-by: Martin Storsjö <martin@martin.st>
| * pixdesc: add av_pix_fmt_get_chroma_sub_sampleLuca Barbato2012-11-131-1/+3
| | | | | | | | Deprecate avcodec_get_chroma_sub_sample.
View Lorry Controller Status