summaryrefslogtreecommitdiff
path: root/ffmpeg_opt.c
Commit message (Collapse)AuthorAge
* ffmpeg: apply flags to attachments too.Nicolas George2013-01-01
|
* ffmpeg: move stream_copy flags handling after attachments.Nicolas George2013-01-01
|
* better filter error message when accidentally reusing outputsrogerdpack2013-01-01
| | | | | Signed-off-by: rogerdpack <rogerpack2005@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: mark attachment streams finished.Nicolas George2013-01-01
| | | | Fix trac ticket #2083.
* ffmpeg: avoid negative timestamps for DVDMichael Niedermayer2013-01-01
| | | | | | | | dvdauthor cannot handle files with ts wraps Fixes ticket383 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: fix recording time in->out carryover.Michael Niedermayer2012-12-20
| | | | | | This should fix valgrind complaints. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer2012-12-20
| | | | | | | | | | | | | | * 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>
* ffmpeg_opt: fix pointer typesMichael Niedermayer2012-12-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'acb571c89a065d943163c11efb46de35774f1909'Michael Niedermayer2012-12-20
| | | | | | | | | | | | | * commit 'acb571c89a065d943163c11efb46de35774f1909': avcodec: bump minor for adaptive h264 frame-mt avconv: pass the actually selected decoder to filter_codec_opts(). Conflicts: Changelog ffmpeg_opt.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer2012-12-20
| | | | | | | | | | | | * commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use GROW_ARRAY in opt_map_channel.Clément Bœsch2012-12-19
|
* Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'Michael Niedermayer2012-12-19
| | | | | | | * commit '10bca66101b79954512cd9d8ee20c3bc4513adf3': cmdutils: add a macro to simplify grow_array() calls. Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use avformat_seek_file() instead of av_seek_frame().Clément Bœsch2012-12-02
| | | | | | | | avformat_seek_file() is the new API. It will make sure the read_seek2() callback is called when the demuxer has it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Clément Bœsch <ubitux@gmail.com>
* ffmpeg: fix swr filter_type for auto inserted aresample filtersMichael Niedermayer2012-11-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '28c8e288fa0342fdef532a7522a4707bebf831cc'Michael Niedermayer2012-11-26
| | | | | | | | | | | | | | | * commit '28c8e288fa0342fdef532a7522a4707bebf831cc': x86: h264_chromamc: port to cpuflags yop: fix typo avconv: fix copying per-stream metadata. doc: avtools-common-opts: Fix terminology concerning metric prefixes configure: suncc: Add compiler arch support for Nehalem & Sandy Bridge riff: Make ff_riff_tags static and move under appropriate #ifdef Conflicts: libavformat/riff.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* replace av_log(0, by av_log(NULL,Michael Niedermayer2012-11-23
| | | | | | The first parameter is a pointer and NULL is more correct Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: complain loudly and exit in case removed -sameq option is specifiedStefano Sabatini2012-11-03
| | | | | This is better than silently ignoring the option, which results in unexpected quality results.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-11-01
| | | | | | | | | | | | * qatar/master: fate: add ac3/eac3 tests to FATE_SAMPLES_AVCONV avconv_opt, cmdutils: Add missing function parameter Doxygen x86: Move optimization suffix to end of function names Conflicts: cmdutils.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use av_rescale_delta() on the audio filter inputMichael Niedermayer2012-10-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a'Michael Niedermayer2012-10-23
| | | | | | | | | | | | | | | | * commit '2b8dd371e4d276ca0d342e82b8b4cc281be0630a': lavu: postpone recent deprecations until the next major bump APIchanges: update lavr bump date avconv: only apply presets when we have an encoder. atrac3: replace a calculation with FFALIGN() atrac3: remove unused ATRAC3Context field, sample_rate atrac3: use sizeof(variable) instead of sizeof(type) atrac3: simplify MDCT window calculation Conflicts: doc/APIchanges Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'Michael Niedermayer2012-10-17
| | | | | | | | | | | | * commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68': lavf: move RIFF INFO tag writing from avienc to riff avconv: fix disabling auto mappings with -map_metadata Conflicts: ffmpeg_opt.c libavformat/riff.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Make video filter graph reinit user selectableMichael Niedermayer2012-10-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer2012-10-13
| | | | | | | | | | | | | | * commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be': Remove libmpeg2 #define remnants De-doxygenize some top-level files Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4436f25a1682ada3f7226cb6fadf429946933161'Michael Niedermayer2012-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4436f25a1682ada3f7226cb6fadf429946933161': build: remove references to unused EXTRAOBJS variable lavfi: convert input/ouput list compound literals to named objects fate: add h263 obmc vsynth tests avconv: remove bogus warning when using avconv -h without parameter averror: explicitly define AVERROR_* values flashsv: propagate inflateReset() errors indeo4/5: remove constant parameter num_bands from wavelet recomposition mxfdec: return error if no segments are available in mxf_get_sorted_table_segments Double motion vector range for HPEL interlaced picture in proper place Conflicts: libavcodec/v210dec.h libavfilter/af_aformat.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_channelmap.c libavfilter/af_join.c libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/f_setpts.c libavfilter/f_settb.c libavfilter/fifo.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fieldorder.c libavfilter/vf_fps.c libavfilter/vf_hflip.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_select.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/vsrc_testsrc.c libavformat/mxfdec.c libavutil/error.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: dont fail for sameq/same_quant.Michael Niedermayer2012-10-11
| | | | | | Instead print a warning. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-10
| | | | | | | | | | | | | | * commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a'Michael Niedermayer2012-10-10
| | | | | | | | | | | | | | | | | | | * 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>
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* ffserver: fix seeking with ?date=...Clément Bœsch2012-10-08
| | | | | | | | | | | Regression since 5f847bf61dca1fd1a2f65a2f56c9a99d1cb716ab. After this commit, timestamps pushed by FFmpeg won't be relative anymore, but absolute (based on the date/time at the beginning of the push). This will allow seeking to work properly. Before this patch, the seek was done, but ffm timestamps were way smallers than the absolute requested timestamp (based on a date), so the seek was done, but to the end of the stream (which was similar to no effect at all).
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-02
| | | | | | | | | | | | | | | | | | | | * 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>
* ffmpeg: add option to control copying of frames prior to start.Michael Niedermayer2012-09-27
| | | | | | | | | | | Normally we discard things prior to the intended start for stream copy this is not always possible, and its not done by default this option allows discarding to be enabled this is primarely usefull when transcoding a video and stream copying an audio stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: avoid apics for video output if possibleMichael Niedermayer2012-09-26
| | | | | | Fixes Ticket1714 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: factor area out of video stream selection code.Michael Niedermayer2012-09-25
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: fix 10l (use of uninitilaized variable)Michael Niedermayer2012-09-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: remove now unneeded old *_codec_name codeMichael Niedermayer2012-09-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg/opt_output_file: extract subtitle codec name through new APIMichael Niedermayer2012-09-22
| | | | | | This should fix specifying subtitle codecs with the new syntax in some cases. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: dont match unspecified media types in MATCH_PER_TYPE_OPTMichael Niedermayer2012-09-22
| | | | | | This would change existing behavior, and should if done, done seperately. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg/opt_preset: update to new option API for reading codec names.Michael Niedermayer2012-09-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: fix overriding codecs with the new syntaxMichael Niedermayer2012-09-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer2012-08-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* ffmpeg: Fix assert failureMichael Niedermayer2012-08-31
| | | | | | Fixes Ticket1674 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-26
| | | | | | | | | | | | | | | * qatar/master: x86: fft: remove unused fft_dispatch* functions avconv: remove unused variable opt_shortest FATE: Add Canopus Lossless tests cllc: Pad swapped buffer Conflicts: ffmpeg_opt.c tests/ref/fate/cllc-argb tests/ref/fate/cllc-rgb Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: remove outdated warning.Nicolas George2012-08-21
| | | | -t works with complex filters now.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-20
| | | | | | | | | | | | | | | | | | | * qatar/master: fate: Add FATE tests for the Ut Video encoder lavc: add Ut Video encoder mpegvideo_enc: remove stray duplicate line from 7f9aaa4 swscale: x86: fix #endif comments in rgb2rgb template file avconv: mark more options as expert. avconv: split printing "main options" into global and per-file. avconv: refactor help printing. Conflicts: Changelog ffmpeg_opt.c ffserver.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'Michael Niedermayer2012-08-20
| | | | | | | | | | | | | | | | * commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174': avconv: print info/capabilities options in a separate help group. avtools: add -h demuxer/muxer cmdutils: extend -h to allow printing codec details. Conflicts: cmdutils.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'Michael Niedermayer2012-08-20
| | | | | | | | | | | | | * commit '7c5012127fb7e18f0616011257bb4248f6a8b608': cmdutils: change semantics of show_help_options() and document it. avtools: move some newlines to show_help_options(). avconv: deprecate -isync. Conflicts: ffmpeg_opt.c ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '8fc83fb081963001e1197c6fdd59fd2af415078a'Michael Niedermayer2012-08-20
| | | | | | | | | | * commit '8fc83fb081963001e1197c6fdd59fd2af415078a': avconv: reformat the options table. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: get rid of casts for the HAS_ARG caseMichael Niedermayer2012-08-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_opt: remove casts for OPT_FUNC2Michael Niedermayer2012-08-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-13 01:39:36 +0000