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

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/cmdutils.c
AgeCommit message (Collapse)Author
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>
2012-10-25cmdutils: remove writes in never read variableMichael Niedermayer
Fixes CID739868 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-24Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'Michael Niedermayer
* commit '80521c1997a23e148edf89e11b939ab8646297ca': build: allow targets to specify extra objects to link with executables swscale: avoid pointless use of compound literals libm: add fallbacks for various single-precision functions network: use getservbyport() only if available network: add fallbacks for INADDR_LOOPBACK and INET_ADDRSTRLEN Include sys/time.h before sys/resource.h Conflicts: Makefile configure libavutil/libm.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23Include sys/time.h before sys/resource.hMans Rullgard
Some systems require sys/time.h being explicitly included before sys/resource.h. The configure check already does this. Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-23cmdutils: apply option to codec and format contexts if possible.Michael Niedermayer
This is needed for setting both contexts -err_detect at once. Reviewed-by: Clément Bœsch <ubitux@gmail.com> Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-18cmdutils: add missing check for ftell() returnMichael Niedermayer
Fixed CID703706 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-18cmdutils: remove unneeded null checkMichael Niedermayer
Fixes CID703769 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'Michael Niedermayer
* commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df': tools: do not use av_pix_fmt_descriptors directly. pixdesc: add functions for accessing pixel format descriptors. build: add support for Tru64 (OSF/1) md5: Allocate a normal private context for the opaque md5 context pointer Conflicts: cmdutils.c doc/APIchanges ffprobe.c libavformat/md5enc.c libavutil/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12tools: do not use av_pix_fmt_descriptors directly.Anton Khirnov
2012-10-10Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer
* commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a': cmdutils_read_file: increment *size after writing the trailing \0 af_resample: unref out_buf when avresample_convert returns 0 af_amix: prevent memory leak on error path vc1dec: prevent memory leak in error path vc1dec: prevent memory leak on av_realloc error af_channelmap: free old extended_data on reallocation avconv: simplify memory allocation in copy_chapters matroskaenc: check cue point validity before reallocation swfenc: error out for more than 1 audio or video stream build: link test programs only against static libs Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-09cmdutils_read_file: increment *size after writing the trailing \0Janne Grunau
Fixes CID732166.
2012-10-08Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer
* commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov
2012-10-02Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: ARM: fix Thumb PIC on Apple nut: add do {} while (0) to GET_V tiffenc: Check av_malloc() results. tiffenc: Simplify pixel format setup using AVPixFmtDescriptor. Use atexit() instead of defining a custom exit_program() interface. msvc: Fix detection of VFW & Avisynth required libs Conflicts: ffmpeg.c ffmpeg_opt.c ffplay.c ffprobe.c ffserver.c libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02Use atexit() instead of defining a custom exit_program() interface.Diego Elio Pettenò
2012-09-23cmdutils: sort codec lists.Nicolas George
The lists are sorted first by type (video first) and then alphabetically by name. Fix ticket #1669.
2012-09-19Fix segfault with -filters optionBobby Bingham
Filters now use null pointers to indicate having no input/output pads, rather than empty lists of pads. We can't assume pad is non-null anymore. Signed-off-by: Bobby Bingham <uhmmmm@gmail.com>
2012-09-16msvc: Add a va_copy compatability macro for msvcDerek Buitenhuis
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2012-09-15cmdutils: avoid setting data pointers to invalid values in alloc_buffer()Anton Khirnov
Fixes bug 352.
2012-08-31Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer
* commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5': x86: Fix linking with some or all of yasm, mmx, optimizations disabled configure: Add more fine-grained SSE CPU capabilities flags avfilter: x86: Use more precise compile template names x86: cosmetics: Comment some #endifs for better readability g723_1: add comfort noise generation utvideoenc: Switch to dsputils' median prediction utvideoenc: Avoid writing into the input picture avtools: remove the distinction between func_arg and func2_arg. avconv: make the -passlogfile option per-stream. avconv: make the -pass option per-stream. cmdutils: make -codecs print lossy/lossless flags. lavc: add lossy/lossless codec properties. Conflicts: Changelog cmdutils.c configure doc/APIchanges ffmpeg.h ffmpeg_opt.c ffprobe.c libavcodec/codec_desc.c libavcodec/g723_1.c libavcodec/utvideoenc.c libavcodec/version.h libavcodec/x86/mpegaudiodec.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-30avtools: remove the distinction between func_arg and func2_arg.Anton Khirnov
func2_arg is the same as func_arg, except it has one additional parameter. Change all func_arg callbacks to take that parameter (and ignore it).
2012-08-30cmdutils: make -codecs print lossy/lossless flags.Anton Khirnov
2012-08-28cmdutils: add -layouts option.Nicolas George
Extract of the output: | Individual channels: | NAME DESCRIPTION | FL front left | FR front right | <snip> | SDR surround direct right | | Standard channel layouts: | NAME DECOMPOSITION | mono FC | stereo FL+FR | <snip> | octagonal FL+FR+FC+BL+BR+BC+SL+SR | downmix DL+DR
2012-08-25Fix one of the problems with -codecs, -encoders and -decoders.Carl Eugen Hoyos
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 20:31:10 +0300