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
path: root/ffmpeg_opt.c
AgeCommit message (Collapse)Author
2014-09-20ffmpeg_opt: reduce diff to libav in opt_target() by 16 linesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 7a67ab5cba8ed5509be5d058fe9e5612ef39d3b0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-20Merge commit 'f7395926f204051af9ad459a6d876b96ee6179ee' into release/2.2Michael Niedermayer
* commit 'f7395926f204051af9ad459a6d876b96ee6179ee': avconv: fix parsing the AVOptions for -target Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-11ffmpeg_opt: Use av_guess_codec() instead of AVOutputFormat->*codecMichael Niedermayer
Fixes part of ticket2236 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 956f4087c6eb717e31f3b92fe03fd56a3747eccf) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-30Merge commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf' into release/2.2Michael Niedermayer
* commit 'b20a8ad619ac0e2631391b6311cc000de85d22bf': video4linux2: Avoid a floating point exception Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17ffmpeg_opt: check that a subtitle encoder is available before auto mapping ↵Michael Niedermayer
streams Fixes Ticket3470 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 25bcf24d4d0faf0191923be8afac8f67ca98b500)
2014-02-25ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code checkTimothy Gu
avio_open2() only return < 0 when error. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-24Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'Michael Niedermayer
* commit '746dca483a2f0f2639265f6e1c0085c8861875a1': avconv: support forcing codec tags for input streams Conflicts: doc/ffmpeg.texi See: 6bca574a98ba604459f6ee92538b19d25bba0973 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-18ffmpeg: support setting the chroma intra matrixMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-17ffmpeg_opt: assert_file_overwrite: Work for all file protocol outputsAlexander Strasser
Currently the file overwrite check does not work for paths that contain a colon. Use avio_find_protocol to always execute the existence check if the file protocol is going to be used. Fix remaining part of ticket #3249. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2014-01-03ffmpeg: do not fail when options are routed to libavformat and libavcodec ↵Michael Niedermayer
and only one can be used Fixes setting frame_size for pulse demuxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-26ffmpeg_opt: Fix -target vcdCarl Eugen Hoyos
The removed line makes no sense and doesnt work fixes ticket #3239 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-04Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avconv: initialize hwaccel_pix_fmt Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer
* commit '07fd0a22192805d56c635eb294dc26b0a54ae325': avconv: add infrastructure for using hwaccels Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-16ffmpeg: Do not fill gap before the first decodable frame on single stream ↵Michael Niedermayer
input files unless the user explicitly requests it. Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14ffmpeg_opt: fix overriding values set by -targetMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09ffmpeg: generate more specific error message in case of inconsistent ↵Stefano Sabatini
filtering options In particular, distinguish if the option was -filter or -filter_script. Suggested-by: Nicolas George
2013-11-09ffmpeg: store value of -filter and -filter_script per-stream option in ↵Stefano Sabatini
OutputStream struct Avoid the need for multiple potentially inconsistent access operations, slightly factorize code.
2013-11-03ffmpeg: add verbose consistency checks in case of filtering inconsistent optionsStefano Sabatini
In particular, warn in case -filter and streamcopy is used at the same time, fix trac ticket #678.
2013-10-21make it possible to compile ffmpeg without swscalePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-08ffmpeg: add max_error_rate to allow tuning the point decoding errors are ↵Michael Niedermayer
considered a failure of the whole transcoding. Suggested-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03ffmpeg: avoid direct access to lowres use av_codec_g/set_lowres()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03ffmpeg: add support to force specific AVCodecsMichael Niedermayer
previously only codec_ids could be forced, which did not allow forcing a specific implementation like libopenjpeg vs jpeg2000. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer
* commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06ffmpeg_opt: Remove support for specifying -t anywhere to set the durationMichael Niedermayer
This would otherwise conflict with the semantics of using -t for the input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer
* commit '811bd0784679dfcb4ed02043a37c92f9df10500e': avconv: make input -ss accurate when transcoding Conflicts: Changelog doc/ffmpeg.texi ffmpeg.h ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'Michael Niedermayer
* commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8': avconv: distinguish between -ss 0 and -ss not being used Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-01Merge commit '7748dd41be3d6dd6300f14263586af4ee104ead2'Michael Niedermayer
* commit '7748dd41be3d6dd6300f14263586af4ee104ead2': avconv: add -n option to immediately exit when output files already exist Conflicts: Changelog doc/ffmpeg.texi ffmpeg_opt.c See: 0a4f02117b67c135a27e3490aea1631ad9f4312f Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09ffmpeg_opt: do not warn about unused gop_timecodeMichael Niedermayer
The option is injected by generic code and being sometimes unused is normal. Fixes Ticket2762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09ffmpeg: Allow overriding ffservers inputMichael Niedermayer
Fixes Ticket1970 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09ffmpeg: move creation_time for ffserver setting upMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08ffmpeg_opt: replace exit() by exit_program()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-09ffmpeg: add -apad option which injects a apad filter only in the presence of ↵Michael Niedermayer
video streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-07ffmpeg: move a local variable definition later.Nicolas George
Fix a segfault when using the -map option without input files.
2013-05-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117'Michael Niedermayer
* commit '3d624420086ed3cd0c74f4510f0285968e21c117': avconv_opt: allocate an OutputFile before the streams. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19ffmpeg: make -aspect work with -vcodec copy.Nicolas George
2013-04-12Merge commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0'Michael Niedermayer
* commit 'dc574658d15ad8f171dbdecbdce7197acf9424a0': avconv: print filter options in -h full output. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer
* commit '38f0c0781a6e099f11c0acec07f9b8be742190c4': lavfi: merge avfiltergraph.h into avfilter.h Conflicts: doc/APIchanges ffmpeg_filter.c libavfilter/avfilter.h libavfilter/avfiltergraph.h libavfilter/version.h tools/graph2dot.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-09ffmpeg: use a rational for -aspect option.Nicolas George
2013-04-08ffmpeg: Print a warning when -frames is affecting non video framesMichael Niedermayer
Fixes Ticket2395 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c': lavfi/gradfun: remove rounding to match C and SSE code. lavfi/gradfun: fix dithering in MMX code. lavfi/gradfun: fix rounding in MMX code. lavfi/gradfun: do not increment DC pointer for odd values. fate: filter: Add dependencies avconv: add options for reading filtergraphs from a file. Conflicts: Changelog doc/ffmpeg.texi doc/filters.texi ffmpeg.h ffmpeg_opt.c libavfilter/vf_gradfun.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26ffmpeg_opt: avoid strcpy()Michael Niedermayer
This fixes a warning on openbsd and is more robust Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-21ffmpeg: Replace -deinterlace (which was broken by the buffer ref stuff) with ↵Michael Niedermayer
yadif injection Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-17ffmpeg: make -lavfi an alias for -filter_complex.Nicolas George
2013-03-16ffmpeg_opt: add OPT_INPUT to -fix_sub_duration and -canvas_size.Nicolas George
2013-03-15Merge commit '3e175a2a550f5c2f788e8cd969052e10a5025a27'Michael Niedermayer
* commit '3e175a2a550f5c2f788e8cd969052e10a5025a27': avconv: mark attachment streams as immediately finished vaapi: fix argument for ff_vaapi_common_end_frame call Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14ffmpeg: add OPT_INPUT to -guess_layout_max.Nicolas George
2013-03-14ffmpeg: add OPT_OUTPUT to -to option.Nicolas George
Fix trac ticket #2355.
2013-03-13Merge commit '666fe5da47d127074be7f0e2bac93db6af8b4a30'Michael Niedermayer
* commit '666fe5da47d127074be7f0e2bac93db6af8b4a30': atomic: Exclude the unsupported implementation headers from checkheaders avconv: do not silently ignore unused codec AVOptions. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 00:57:52 +0300