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
AgeCommit message (Collapse)Author
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-06-10ffmpeg: Add cuvid hwaccel supportTimo Rothenpieler
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-02-17Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'Derek Buitenhuis
* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140': avconv_vdpau: use the hwcontext API to simplify code Tested-by: wm4 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-12-28ffmpeg: use lavf API for applying bitstream filtersRodger Combs
2015-12-12ffmpeg: Add basic support to mux multiple programsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-16ffmpeg: Fixing typos and adding comments to fps codeBryan Huh
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-11ffmpeg: set muxer packet duration based on framerate only for CFRMichael Niedermayer
a set ost->frame_rate does not imply CFR in ffmpeg The changed fate tests had all wrong packet durations (like 1/1000 or 1/90000) There might be more cases in which is_cfr could be set Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-22ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22ffmpeg: fix ffmpeg.h trailing whitespaceMarton Balint
How this passed through the commit hook? Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
2015-10-22Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes
* commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-14Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes
* commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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-08-03avcodec: add new Videotoolbox hwaccel.Sebastien Zwickert
2015-07-29ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer
Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28ffmpeg.c: remove all remaining coded_frame usesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28ffmpeg: Use side data instead of coded_frame for error[] valuesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'Michael Niedermayer
* commit '5d3addb937946eca5391e40b5e6308e74ac6f77b': Add a quality factor packet side data Conflicts: doc/APIchanges ffmpeg.c libavcodec/avcodec.h libavcodec/mpegvideo_enc.c libavcodec/version.h Merged-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-05-18ffmpeg: Do not copy the display matrix if rotation meta-data is manually addedMichael Niedermayer
Fixes Ticket4560 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>
2015-04-20ffmpeg: add option not to offset seek position by start timewm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03ffmpeg: last frame duplication heuristicMichael Niedermayer
This improves the last frames duration with CFR and when the input durations are inaccurate or missing Fixes Ticket4119 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-26ffmpeg: allow to set the thread message queue size.Nicolas George
2015-02-04ffmpeg: Make CFR frame drop threshold user adjustableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-25ffmpeg: allow overriding and amending AVStream->dispositionMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-28ffmpeg: add sdp_file optionSimon Thelen
Allow printing of sdp information to a file specified by -sdp_file This allows users to print sdp information when at least one of the outputs isn't an rtp stream. Signed-off-by: Simon Thelen <ffmpeg-dev@c-14.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-30ffmpeg: take bsf arguments from the command lineChristophe Gisquet
The format is now: -bsf:X filter1[=opt1=str1/opt2=str2],filter2 ie the parameters are appended after the filter name using '='. As ',' has been reserved already for the list of filters, '/' is just an example of token separation for now, but that could become part of the API to avoid each bsf using its own tokenization. The proper solution would be using AVOption, but this is overkill for now. Signed-off-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-19ffmpeg: better CFR frame duplication selectionMichael Niedermayer
This improves the handling of cases where the frame duration is not known Fixes Ticket 4119 Fixes Ticket 1578 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-06ffmpeg: add vdpau_old to allow continued testing of the older (but not ↵Michael Niedermayer
oldest) API 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-15ffmpeg: remove 32 channel limit from audio_channels_mapMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10ffmpeg: do not use SWR_CH_MAXMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-04ffmpeg: Do not fail if a demuxer and decoder use the same option identiferMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-07ffmpeg: support setting AVStream.discardMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-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-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-26ffmpeg: use thread message API.Nicolas George
2014-05-21ffmpeg: use av_stream_get_end_pts()Michael Niedermayer
Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-19ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer
Fixes 1 frame error in the duration and derived values, introduced by not using AVStream.pts in the previous commit Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-12Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer
* commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile 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-05-05Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer
* commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-29Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer
* commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'Michael Niedermayer
* commit '4754345027eb85cfa51aeb88beec68d7b036c11e': avconv: print verbose per-stream transcoding statistics Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'Michael Niedermayer
* commit 'baeb59d89beda499688e528c6a269d2b255b66f2': avconv: rewrite output data size tracking Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'Michael Niedermayer
* commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9': avconv: add stream-global side data to the first demuxed packet Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>