Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-03-04Remove incorrect use of ctype.h functions.Reimar Döffinger
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>
2013-03-01Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'Michael Niedermayer
* 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>
2013-02-28cmdutils: Allow calling filter_codec_opts without a set encoderMartin Storsjö
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>
2013-02-26Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'Michael Niedermayer
* 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>
2013-02-26cmdutils: only use libavresample when it is enabledJustin Ruggles
avprobe and avserver use cmdutils and do not strictly require libavresample.
2013-02-24ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer
This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24cmdutils: fix null pointer dereferenceMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer
* 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>
2013-02-24avconv: pass libavresample options to AVFilterGraphJustin Ruggles
2013-02-16Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'Michael Niedermayer
* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793': get_buffer(): do not initialize the data. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-15get_buffer(): do not initialize the data.Anton Khirnov
There may be more decoders that rely on this. Those should be found and fixed.
2013-02-06Merge commit '89f11f498b9c15bc71494a11a7ec560f4adf630d'Michael Niedermayer
* commit '89f11f498b9c15bc71494a11a7ec560f4adf630d': qtrle: fix the topmost line for 1bit Conflicts: tests/ref/fate/qtrle-1bit See: 1af91978dbab35ba9fdede187577c00d643ae33b Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06Merge commit '2cd4068071b9a8908823a3107f97e938211045ce'Michael Niedermayer
* commit '2cd4068071b9a8908823a3107f97e938211045ce': fraps: fix off-by one bug for version 1. Conflicts: libavcodec/fraps.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06Merge commit 'da7baaaae79b4d7d715d35ea6bcfbdd149edc177'Michael Niedermayer
* 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>
2013-02-06Merge commit '238614de679a71970c20d7c3fee08a322967ec40'Michael Niedermayer
* 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>
2013-02-06qtrle: fix the topmost line for 1bitKostya Shishkov
Signed-off-by: Anton Khirnov <anton@khirnov.net> CC:libav-stable@libav.org
2013-02-06fraps: fix off-by one bug for version 1.Anton Khirnov
CC:libav-stable@libav.org
2013-02-06aasc: fix output for msrle compression.Anton Khirnov
The bottom line was invalid before. CC:libav-stable@libav.org
2013-02-06cdgraphics: do not rely on get_buffer() initializing the frame.Anton Khirnov
Setting it to zero (instead of 128, as the default get_buffer() does) also produces more correctly-looking output.
2013-02-06cmdutils: remove ansi from the list of broken codecs.Anton Khirnov
It's not relying on get_buffer() initializing the frame since 99e36ddd3ee57c38e6ca9e240ba518848487f849.
2013-01-19cmdline: fix -- to escape files starting with -Michael Niedermayer
Fixes Ticket2127 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-03cmdutils: update copyright year to 2013Johan Andersson
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-01cmdutils: we have 2013Michael Niedermayer
Found-by: durandal_1707 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer
* 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>
2012-12-20cmdutils: implement debug/fdebug log level update differently.Michael Niedermayer
The old implementation is no longer possibly due to limitations of the new command line parser. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'Michael Niedermayer
* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a': cmdutils: don't log an error in opt_default(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'Michael Niedermayer
* commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77': cmdutils: add a commandline pre-parser. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'Michael Niedermayer
* commit 'a01c02bcff755a7891f777706b27452203aac71e': cmdutils: split parse_option(). Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20cmdutils: pass number of groups to split_commandline().Anton Khirnov
This makes the code simpler and avoids mixing designated and non-designated initializers in a potentially unsafe way in avconv.
2012-12-18cmdutils: don't log an error in opt_default().Anton Khirnov
It results in spurious errors when using the new preparser.
2012-12-18cmdutils: add a commandline pre-parser.Anton Khirnov
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.
2012-12-18cmdutils: split parse_option().Anton Khirnov
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.
2012-12-16lavu: make sure av_pix_fmt_desc_next returns a valid pix fmt.Clément Bœsch
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
2012-12-05Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'Michael Niedermayer
* commit 'ff953fecffd3b9a616a046723fb9d4690be032a6': lavc: set frame properties in ff_get_buffer(). Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05lavc: set frame properties in ff_get_buffer().Anton Khirnov
There is no point in duplicating this code in every get_buffer() implementation.
2012-11-30Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* 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>
2012-11-29cmdutils: Use a configure check for enabling CommandLineToArgvWMartin Storsjö
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>
2012-11-23replace av_log(0, by av_log(NULL,Michael Niedermayer
The first parameter is a pointer and NULL is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-17cmdutils: free the report file name.Nicolas George
Fix coverity issue 743443, which was a harmless leak.
2012-11-16lavu/opt: fix av_opt_get_key_value() API.Nicolas George
Do not skip the end delimiter. Reserve positive return values. This is an API break, but the function was introduced less than two weeks ago.
2012-11-13pixdesc: add av_pix_fmt_get_chroma_sub_sampleLuca Barbato
Deprecate avcodec_get_chroma_sub_sample.
2012-11-09PRINT_CODEC_SUPPORTED: fix used variableMichael Niedermayer
Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-04cmdutils: allow to set the report file name.Nicolas George
The file name can be set by setting the FFREPORT environment variable to "file=something". Fix trac ticket #1823.
2012-11-04Revert "cmdutils: allow specifying the file for -report"Michael Niedermayer
This reverts commit 841bf0ef240f0d862b1f07076e079829456fb117. This does not fully work as the file is used before the filename is parsed so not all information is written in the specified file.
2012-11-01cmdutils: allow specifying the file for -reportMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30Merge commit '381dc1a5ec0925b281c573457c413ae643567086'Michael Niedermayer
* commit '381dc1a5ec0925b281c573457c413ae643567086': fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups fate: Add shorthands for acodec PCM and ADPCM tests avconv: Drop unused function argument from do_video_stats() cmdutils: Conditionally compile libswscale-related bits aacenc: Drop some unused function arguments rtsp: Avoid a cast when calling strtol nut: support textual data nutenc: verbosely report unsupported negative pts Conflicts: cmdutils.c ffmpeg.c libavformat/nut.c libavformat/nutenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-29cmdutils: Conditionally compile libswscale-related bitsDiego Biurrun
This fixes compilation with libswscale disabled.
2012-10-29cmdutils: avoid using cpp directives within printf macro argumentsLeon van Stuivenberg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> It appears such construct has undefined behavior
2012-10-25cmdutils: fix unclosed file on errorMichael Niedermayer
Fixes CID739865 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>