summaryrefslogtreecommitdiff
path: root/ffmpeg_filter.c
Commit message (Collapse)AuthorAge
* ffmpeg_filter: Fix AVBufferSrcParameters leakMichael Niedermayer2016-05-19
| | | | | | Fixed: CID1361950 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'Derek Buitenhuis2016-05-08
| | | | | | | * commit '5d273d3efac340ef8de445c955ff44c7abed4e8f': avconv: VAAPI hwcontext initialisation and hwaccel helper Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* fix some a/an typosLou Logan2016-03-28
| | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* ffmpeg_filter: Factor get_compliance_unofficial_pix_fmts() outMichael Niedermayer2016-02-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_filter: Add missing pixel formats to strict_std_compliance case for ljpegMichael Niedermayer2016-02-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_filter: Add YUV 444 to strict_std_compliance case for mjpegMichael Niedermayer2016-02-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_filter: remove redundant null ptr checkMichael Niedermayer2015-11-11
| | | | | | Fixes: CID1338331 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_filter: check encoder before using it to set frame size.Nicolas George2015-10-30
| | | | | Fix a segfault when no encoder is found for a default codec with a complex filter graph.
* Revert "Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'" (avconv: Do ↵Michael Niedermayer2015-10-11
| | | | | | | | | | | | | | | | | | | | | | 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>
* Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'Hendrik Leppkes2015-10-10
| | | | | | | * commit '8b830ee9a26d47b138f12a82085cdb372f407f1e': avconv: Do not try to configure filter outputs without streams Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* lavfi: fix compilation with FF_API_OLD_FILTER_OPTS=0.Ronald S. Bultje2015-08-18
|
* ffmpeg_filter: Do not override the dimensions in sub2video_prepare()Michael Niedermayer2015-08-15
| | | | | | Fixes ticket4744 part1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer2015-08-08
| | | | | | other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* ffmpeg_filter: Check that filters have connected outputs before accessing ↵Michael Niedermayer2015-07-19
| | | | | | the output stream Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'Michael Niedermayer2015-07-19
| | | | | | | | | | | * commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c': avconv: split creating and (re-)configuring complex filtergraphs Conflicts: ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg_filter: log more information on failure to init simple filter graphrogerdpack2015-07-02
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_filter: use get_rotation()Michael Niedermayer2015-05-04
| | | | | | This unifies the rotation extraction code between ffplay and ffmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer2015-05-02
| | | | | | | | | | | * 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>
* ffmpeg: fix accurate seeking with -copytsRodger Combs2014-11-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: init sub2video.last_pts.Nicolas George2014-11-05
| | | | | | | | | 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>
* Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'Michael Niedermayer2014-10-17
| | | | | | | | | | | * commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581': avconv: fix leak in filter error Conflicts: ffmpeg_filter.c See: 14369f59c5ad1fb817fb4d94073f31cccf12b556 Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Do av_buffersink_set_frame_size() when reconfiguring the filtergraph ↵Michael Niedermayer2014-09-11
| | | | | | | | not just when changing audio resample parameters Fixes Ticket3562 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Enable compute_edt only when the subtitles are used for a output ↵Michael Niedermayer2014-09-01
| | | | | | | | | stream instead of a filter Fixes/works around Ticket3768 Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Clean up if filter initialisation failed to avoid a memleak.Carl Eugen Hoyos2014-08-30
| | | | | | Fixes ticket #3858. Reviewed-by: Nicolas George
* ffmpeg_filter: refuse to configure input without a decoder.Nicolas George2014-07-30
| | | | | | | | | | 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.
* ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding contextMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_filter: fix choose_pix_fmts() so it uses the correct encoding contextMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer2014-06-01
| | | | | | | | | | | * 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>
* ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctxMichael Niedermayer2014-06-01
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer2014-06-01
| | | | | | | | | | | | * 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>
* Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer2014-05-05
| | | | | | | | | | | * commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_filter: make *jpeg_formats static constMichael Niedermayer2014-04-28
| | | | | Found-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_filter: fix pointer to local outside scopeMichael Niedermayer2014-04-27
| | | | | Fixes CID1206652 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-24
| | | | | | | | | | | | | | * 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>
* Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer2013-11-23
| | | | | | | | | | | | | * 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>
* ffmpeg_filter: Fix non jpeg yuv in jpeg supportMichael Niedermayer2013-10-27
| | | | | | | 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>
* ffmpeg_filter: Pass command line -threads X to filtergraphMichael Niedermayer2013-10-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_filter: check that the input media type match the filterMichael Niedermayer2013-08-14
| | | | | | Fixes Ticket2012 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_filter: do not pick evil path for trim filtersPaul B Mahol2013-08-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* ffmpeg: remove obsolete workaround in trim insertion.Nicolas George2013-08-07
| | | | | | | | 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.
* Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer2013-08-06
| | | | | | | | | | | * commit '488a0fa68973d48e264d54f1722f7afb18afbea7': avconv: support -t as an input option. Conflicts: Changelog ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '811bd0784679dfcb4ed02043a37c92f9df10500e'Michael Niedermayer2013-08-06
| | | | | | | | | | | | | * 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>
* Merge commit '56ee3f9de7b9f6090d599a27d33a392890a2f7b8'Michael Niedermayer2013-08-06
| | | | | | | | | | | * 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>
* Merge commit '2e661f26f8b12195f75ae3b07d9591e395135bc7'Michael Niedermayer2013-08-06
| | | | | | | | | | * 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>
* Merge commit '06cd4c5a68e23f5be199c0d2d563da80989f839f'Michael Niedermayer2013-08-06
| | | | | | | * commit '06cd4c5a68e23f5be199c0d2d563da80989f839f': avconv: fix usage of deprecated lavfi API Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'Michael Niedermayer2013-08-05
| | | | | | | | | | * commit '51fc88e7467169031b20b9983d80456b893a9fa3': avconv: improve some variable names Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg_filter: replace exit() by exit_program()Michael Niedermayer2013-07-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'Michael Niedermayer2013-05-10
| | | | | | | * commit '72fbc9685c08baae7ab9996642707eaab873b6f1': avconv: use current syntax for the scale filter Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 14:11:09 +0000