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_filter.c
AgeCommit message (Collapse)Author
2016-09-21ffmpeg: switch to codecparClément Bœsch
This commit is largely based on commit 15e84ed3 from Anton Khirnov <anton@khirnov.net> which was previously skipped in bbf5ef9d. There are still a bunch of things raising codecpar related warnings that need fixing, such as: - the use of codec->debug in the interactive debug mode - read_ffserver_streams(): it's probably broken now but there is no test - lowres stuff - codec copy apparently required by bitstream filters The matroska references are updated because they now properly forward the field_order (previously unknown, now progressive). Thanks to James Almer for fixing a bunch of FATE issues in this commit. Signed-off-by: Clément Bœsch <clement@stupeflix.com> Signed-off-by: James Almer <jamrial@gmail.com>
2016-08-04Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into mergeTimothy Gu
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee': avconv: create simple filtergraphs earlier Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-08-04Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'Timothy Gu
* commit '49670e4218d34899a1c37abb7a11615efc16f757': avconv: add a function for determining whether a filtergraph is simple Conflicts: avconv.c Merged-by: Timothy Gu <timothygu99@gmail.com>
2016-05-19ffmpeg_filter: Fix AVBufferSrcParameters leakMichael Niedermayer
Fixed: CID1361950 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-05-09Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'Derek Buitenhuis
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f': avconv: VAAPI hwcontext initialisation and hwaccel helper Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-29fix some a/an typosLou Logan
Signed-off-by: Lou Logan <lou@lrcd.com>
2016-02-10ffmpeg_filter: Factor get_compliance_unofficial_pix_fmts() outMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-10ffmpeg_filter: Add missing pixel formats to strict_std_compliance case for ljpegMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-02-10ffmpeg_filter: Add YUV 444 to strict_std_compliance case for mjpegMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-11ffmpeg_filter: remove redundant null ptr checkMichael Niedermayer
Fixes: CID1338331 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-30ffmpeg_filter: check encoder before using it to set frame size.Nicolas George
Fix a segfault when no encoder is found for a default codec with a complex filter graph.
2015-10-11Revert "Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'" (avconv: Do ↵Michael Niedermayer
not try to configure filter outputs without streams) FFmpeg already tests for this case in configure_output_filter() and printed a clearer error message example: ./ffmpeg -f lavfi -i color -f lavfi -i color -filter_complex "[1]null[x],[0][1]overlay" -f null - before the merge / after the revert: Filter null has a unconnected output after the merge / before the revert: Output pad "default" with type video of the filter instance "Parsed_null_0" of null not connected to any destination Error configuring complex filters. Invalid argument This reverts commit 3e3779cd517e4d2d1f21d5eb6afdb428cd3c1aa0, reversing changes made to 0b28039a44b33753d77116691d680bd60f3bac1f. Reviewed-by: Ganesh Ajjanagadde <gajjanag@mit.edu>
2015-10-10Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'Hendrik Leppkes
* commit '8b830ee9a26d47b138f12a82085cdb372f407f1e': avconv: Do not try to configure filter outputs without streams Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-19lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.Ronald S. Bultje
2015-08-15ffmpeg_filter: Do not override the dimensions in sub2video_prepare()Michael Niedermayer
Fixes ticket4744 part1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-08-08ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer
other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19ffmpeg_filter: Check that filters have connected outputs before accessing ↵Michael Niedermayer
the output stream Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-19Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'Michael Niedermayer
* commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c': avconv: split creating and (re-)configuring complex filtergraphs Conflicts: ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-02ffmpeg_filter: log more information on failure to init simple filter graphrogerdpack
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-04ffmpeg_filter: use get_rotation()Michael Niedermayer
This unifies the rotation extraction code between ffplay and ffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-02Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer
* commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2': avconv: Add an option for automatically rotating video according to display matrix Conflicts: Changelog ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-24ffmpeg: fix accurate seeking with -copytsRodger Combs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-05ffmpeg: init sub2video.last_pts.Nicolas George
Get the heartbeat working when the video has negative timestamps. Fix trac ticket #4062. Signed-off-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-17Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'Michael Niedermayer
* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581': avconv: fix leak in filter error Conflicts: ffmpeg_filter.c See: 14369f59c5ad1fb817fb4d94073f31cccf12b556 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-11ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph ↵Michael Niedermayer
not just when changing audio resample parameters Fixes Ticket3562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-01ffmpeg: Enable compute_edt only when the subtitles are used for a output ↵Michael Niedermayer
stream instead of a filter Fixes/works around Ticket3768 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-30ffmpeg: Clean up if filter initialisation failed to avoid a memleak.Carl Eugen Hoyos
Fixes ticket #3858. Reviewed-by: Nicolas George
2014-07-30ffmpeg_filter: refuse to configure input without a decoder.Nicolas George
The decoder is necessary in order to filter frames. This makes the error message clearer in this case: currently, it will usually fail because the pixel or sample format is not defined and is converted into "(null)" (non-portable). Enhance trac ticket #3779.
2014-06-01ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding contextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg_filter: fix choose_pix_fmts() so it uses the correct encoding contextMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer
* commit '383136264ef40452efd86cafb2d7221cd3830b3d': avconv: do not use the stream codec context for encoding Conflicts: ffmpeg.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctxMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer
* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5': avconv: do not use the stream codec context for decoding Conflicts: ffmpeg.c ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-05Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer
* commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-28ffmpeg_filter: make *jpeg_formats static constMichael Niedermayer
Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-27ffmpeg_filter: fix pointer to local outside scopeMichael Niedermayer
Fixes CID1206652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-24Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: Add missing #includes for *INT64_MAX and *INT64_C Conflicts: ffmpeg.c ffmpeg_filter.c ffplay.c libavformat/assdec.c libavformat/avidec.c 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-10-27ffmpeg_filter: Fix non jpeg yuv in jpeg supportMichael Niedermayer
This is a regression, did not bisect so dont know what caused it but likely some changes to the command line handling code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25ffmpeg_filter: Pass command line -threads X to filtergraphMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-14ffmpeg_filter: check that the input media type match the filterMichael Niedermayer
Fixes Ticket2012 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-12ffmpeg_filter: do not pick evil path for trim filtersPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-08-07ffmpeg: remove obsolete workaround in trim insertion.Nicolas George
The bug it was working seems to have been fixed. This change causes ffmpeg to use the trim filter to implement the -t option. FATE tests are updated due to the more accurate handling of the last packets.
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-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-06Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'Michael Niedermayer
* commit '2e661f26f8b12195f75ae3b07d9591e395135bc7': avconv: insert extra filters in the same way for both graph inputs and outputs Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-06Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'Michael Niedermayer
* commit '06cd4c5a68e23f5be199c0d2d563da80989f839f': avconv: fix usage of deprecated lavfi API Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 18:05:34 +0300