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
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>
2013-08-05Merge commit '51fc88e7467169031b20b9983d80456b893a9fa3'Michael Niedermayer
* commit '51fc88e7467169031b20b9983d80456b893a9fa3': avconv: improve some variable names Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08ffmpeg_filter: replace exit() by exit_program()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-11Merge commit '72fbc9685c08baae7ab9996642707eaab873b6f1'Michael Niedermayer
* commit '72fbc9685c08baae7ab9996642707eaab873b6f1': avconv: use current syntax for the scale filter Merged-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-01Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a'Michael Niedermayer
* commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a': avconv: make output -ss insert trim/atrim filters. Conflicts: Changelog ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-01Merge commit 'a83c0da539fb07260310bc3b34056239d2b138b2'Michael Niedermayer
* commit 'a83c0da539fb07260310bc3b34056239d2b138b2': avconv: make -t insert trim/atrim filters. The filter insertion code is merged but disabled as it is buggy. For example it fails in various ways when used with -s with some files. Also the trimming is arguably less accurate than the default without filters in some cases. These issues should be fixed before auto inserting the filters, until then the user can explicitly add a trim/atrim filter when one is wanted. Conflicts: Changelog ffmpeg.c ffmpeg_filter.c tests/ref/fate/bethsoft-vid tests/ref/lavf/aiff tests/ref/lavf/asf tests/ref/lavf/au tests/ref/lavf/avi tests/ref/lavf/dpx tests/ref/lavf/ffm tests/ref/lavf/gxf tests/ref/lavf/jpg tests/ref/lavf/mkv tests/ref/lavf/mmf tests/ref/lavf/mov tests/ref/lavf/mpg tests/ref/lavf/nut tests/ref/lavf/ogg tests/ref/lavf/pcx tests/ref/lavf/png tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/lavf/voc tests/ref/lavf/voc_s16 tests/ref/lavf/wav Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-21ffmpeg_filter: fix leak on errorMichael Niedermayer
Fixes: CID1005311 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12Merge commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb'Michael Niedermayer
* commit 'bee2d75b66e2f02e0877796c01202299a4b56cfb': avconv: update to the new options syntax. Conflicts: ffmpeg_filter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12ffmpeg: use options for abuffersink.Nicolas George
Also remove unused buffersink_params. Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-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-11ffmpeg: insert format filter with the appropriate separator.Clément Bœsch
Similar to 937325f3.
2013-04-11ffmpeg: insert aformat filter with the appropriate separator.Clément Bœsch
The ',' separator is deprecated with aformat, and thus causes various arnings when transcoding audio.
2013-03-29ffmpeg/avformat: factor av_guess_frame_rate() outMichael Niedermayer
This will be used in ffplay 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-13Remove references to the "ff" variant of buffersink.Nicolas George
2013-03-10ffmpeg: port sub2video to AVFrame.Nicolas George
And re-enable the FATE test.
2013-03-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avconv: Make sure the encoder exists before inspecting supported_list Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-25ffmpeg: Force a first_pts of 0 for the first configuration of -async useMichael Niedermayer
This is very close to what the default does currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer
This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044': avconv: pass libavresample options to AVFilterGraph Conflicts: cmdutils.c cmdutils.h ffmpeg_filter.c ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-21ffmpeg: set resample_pix_fmt for sub2video.Nicolas George
Forgotten when the resample_* fields were added. Fix assert failures.
2013-01-26ffmpeg: support filtering of unknown channel layouts.Nicolas George
2013-01-02ffmpeg: sub2video: set resample size.Nicolas George
Necessary after 04a530f.
2012-12-25ffmpeg: use the new swr -async parameter instead of a set of parameters.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'Michael Niedermayer
* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3': cmdutils: add a macro to simplify grow_array() calls. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20ffmpeg_filter: use frame instead of decoder context pixel formatMichael Niedermayer
prevents regressions from h264-mt frame size changing code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20ffmpeg_filter: use frame dimensions instead of decoder context dimensions.Michael Niedermayer
avoids regression from the h264-mt frame size change code. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-16ffmpeg: Improve filter input fps selection heuristic.Michael Niedermayer
This fixes a broken file that has a incorrect timebase at the codec level. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-06Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'Michael Niedermayer
* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56': pixdesc: fix yuva 10bit bit depth avconv: deprecate the -vol option x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling x86: af_volume: add SSE2-optimized s16 volume scaling Conflicts: ffmpeg.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26ffmpeg: fix swr filter_type for auto inserted aresample filtersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-26ffmpeg: fix passing swresample options to the auto inserted swrMichael Niedermayer
Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 01:07:27 +0300