summaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'Derek Buitenhuis2016-02-171-1/+0
| | | | | | | | * commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140': avconv_vdpau: use the hwcontext API to simplify code Tested-by: wm4 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* ffmpeg: use lavf API for applying bitstream filtersRodger Combs2015-12-281-1/+0
|
* ffmpeg: Add basic support to mux multiple programsMichael Niedermayer2015-12-111-0/+2
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Fixing typos and adding comments to fps codeBryan Huh2015-11-161-1/+1
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: set muxer packet duration based on framerate only for CFRMichael Niedermayer2015-11-111-0/+1
| | | | | | | | | | | 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>
* ffmpeg: add abort_on option to allow aborting on empty outputMarton Balint2015-10-221-0/+3
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* ffmpeg: fix ffmpeg.h trailing whitespaceMarton Balint2015-10-221-2/+2
| | | | | | | How this passed through the commit hook? Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8'Hendrik Leppkes2015-10-221-0/+5
| | | | | | | * commit 'fb472e1a11a4e0caed2c3c91da01ea8e35d9e3f8': avconv: add support for Intel QSV-accelerated transcoding Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* Merge commit '16b0c929621f84983b83b9735ce973acb12723bc'Hendrik Leppkes2015-10-141-0/+10
| | | | | | | * commit '16b0c929621f84983b83b9735ce973acb12723bc': avconv: Add loop option. Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
* ffmpeg: switch swscale option handling to AVDictionary similar to what the ↵Michael Niedermayer2015-08-081-1/+1
| | | | | | other subsystems use Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec: add new Videotoolbox hwaccel.Sebastien Zwickert2015-08-031-0/+3
|
* ffmpeg: Implement support for seeking relative to EOFMichael Niedermayer2015-07-291-0/+1
| | | | | | Fixes Ticket227 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg.c: remove all remaining coded_frame usesMichael Niedermayer2015-07-281-0/+3
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg: Use side data instead of coded_frame for error[] valuesMichael Niedermayer2015-07-281-0/+3
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit '5d3addb937946eca5391e40b5e6308e74ac6f77b'Michael Niedermayer2015-07-211-0/+3
| | | | | | | | | | | | | | * 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>
* Merge commit '6d592fbd0d8e89ecade3fc93b36ea200213dc01c'Michael Niedermayer2015-07-191-0/+2
| | | | | | | | | | | * 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: Do not copy the display matrix if rotation meta-data is manually addedMichael Niedermayer2015-05-181-0/+1
| | | | | | Fixes Ticket4560 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '16302246b1fcb7ad4e6f7bd31c49956a455336d2'Michael Niedermayer2015-05-021-0/+3
| | | | | | | | | | | * 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: add option not to offset seek position by start timewm42015-04-201-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: last frame duplication heuristicMichael Niedermayer2015-04-031-0/+1
| | | | | | | | | 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>
* ffmpeg: allow to set the thread message queue size.Nicolas George2015-02-261-0/+2
|
* ffmpeg: Make CFR frame drop threshold user adjustableMichael Niedermayer2015-02-041-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: allow overriding and amending AVStream->dispositionMichael Niedermayer2015-01-251-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add sdp_file optionSimon Thelen2014-12-281-0/+1
| | | | | | | | | 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>
* ffmpeg: take bsf arguments from the command lineChristophe Gisquet2014-11-301-0/+1
| | | | | | | | | | | | | 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>
* ffmpeg: fix accurate seeking with -copytsRodger Combs2014-11-241-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: better CFR frame duplication selectionMichael Niedermayer2014-11-191-0/+2
| | | | | | | | | 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>
* ffmpeg: add vdpau_old to allow continued testing of the older (but not ↵Michael Niedermayer2014-10-061-0/+1
| | | | | | oldest) API Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Enable compute_edt only when the subtitles are used for a output ↵Michael Niedermayer2014-09-011-1/+4
| | | | | | | | | 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: remove 32 channel limit from audio_channels_mapMichael Niedermayer2014-08-151-2/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: do not use SWR_CH_MAXMichael Niedermayer2014-08-101-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Do not fail if a demuxer and decoder use the same option identiferMichael Niedermayer2014-08-041-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: support setting AVStream.discardMichael Niedermayer2014-06-071-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding contextMichael Niedermayer2014-06-011-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '383136264ef40452efd86cafb2d7221cd3830b3d'Michael Niedermayer2014-06-011-0/+1
| | | | | | | | | | | * 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>
* Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'Michael Niedermayer2014-06-011-0/+1
| | | | | | | | | | | | * 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>
* ffmpeg: use thread message API.Nicolas George2014-05-261-4/+2
|
* ffmpeg: use av_stream_get_end_pts()Michael Niedermayer2014-05-211-1/+0
| | | | | | Simplifies code and should correct timing values when -*sync drop is used Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add last_mux_dts_plus_durationMichael Niedermayer2014-05-191-0/+1
| | | | | | | 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>
* Merge commit '1839fafa951308237c4672ffd9a94f927b26eac7'Michael Niedermayer2014-05-121-0/+2
| | | | | | | | | | * commit '1839fafa951308237c4672ffd9a94f927b26eac7': avconv: Support VDA hwaccel Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '9580818c5d934bde65a95efd2cee61c174721092'Michael Niedermayer2014-05-051-1/+1
| | | | | | | | | | | * commit '9580818c5d934bde65a95efd2cee61c174721092': avconv: rename OutputStream.opts to OutputStream.encoder_opts Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66'Michael Niedermayer2014-05-051-1/+1
| | | | | | | | | | * commit 'f3a6ad22c977c8fea87c4c5e4535061db6324d66': avconv: rename InputStream.opts to InputStream.decoder_opts Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '35177ba77ff60a8b8839783f57e44bcc4214507a'Michael Niedermayer2014-04-291-0/+2
| | | | | | | | | | | * commit '35177ba77ff60a8b8839783f57e44bcc4214507a': avconv: add support for DXVA2 decoding Conflicts: Makefile configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4754345027eb85cfa51aeb88beec68d7b036c11e'Michael Niedermayer2014-03-241-3/+14
| | | | | | | | | | * commit '4754345027eb85cfa51aeb88beec68d7b036c11e': avconv: print verbose per-stream transcoding statistics Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'baeb59d89beda499688e528c6a269d2b255b66f2'Michael Niedermayer2014-03-241-0/+4
| | | | | | | | | | * commit 'baeb59d89beda499688e528c6a269d2b255b66f2': avconv: rewrite output data size tracking Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9'Michael Niedermayer2014-03-241-0/+3
| | | | | | | | | | * commit '59444c76e6d43529a12dbd80b6dd29c6ba4079a9': avconv: add stream-global side data to the first demuxed packet Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'Michael Niedermayer2014-02-241-1/+0
| | | | | | | | | | | * commit '67f2a688143b644f99360565a9f36c61a5f052e9': avconv: remove a write-only variable Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: make reading packets from thread blocking.Nicolas George2014-02-201-0/+1
| | | | | | | | | | | | | | If a packet is not ready on the input selected by ffmpeg, it will read from another input instead. If that happens repeatedly, frames will accumulate somewhere later in the processing to ensure streams synchronization. It can happen in particular when reading from a slow medium or an expensive lavfi filter graph. Make reading from normal demuxers on non-streamed data and from the lavfi pseudo-device blocking to avoid that. Should fix trac ticket #3079.
* ffmpeg: support setting the chroma intra matrixMichael Niedermayer2014-02-181-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: change ost->finished to an enumMichael Niedermayer2014-01-171-1/+6
| | | | | Idea-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud