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.h
AgeCommit message (Collapse)Author
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>
2014-02-25Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'Michael Niedermayer
* commit '67f2a688143b644f99360565a9f36c61a5f052e9': avconv: remove a write-only variable Conflicts: ffmpeg.c ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-20ffmpeg: make reading packets from thread blocking.Nicolas George
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.
2014-02-18ffmpeg: support setting the chroma intra matrixMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-18ffmpeg: change ost->finished to an enumMichael Niedermayer
Idea-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-23Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer
* commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h 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-11-16ffmpeg: Do not fill gap before the first decodable frame on single stream ↵Michael Niedermayer
input files unless the user explicitly requests it. Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-09ffmpeg: store value of -filter and -filter_script per-stream option in ↵Stefano Sabatini
OutputStream struct Avoid the need for multiple potentially inconsistent access operations, slightly factorize code.
2013-10-30Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'Michael Niedermayer
* commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29': avconv: stop accessing AVStream.parser Conflicts: ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08ffmpeg: add max_error_rate to allow tuning the point decoding errors are ↵Michael Niedermayer
considered a failure of the whole transcoding. Suggested-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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-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-03Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-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-09ffmpeg: use a rational for -aspect option.Nicolas George
2013-03-28Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c': lavfi/gradfun: remove rounding to match C and SSE code. lavfi/gradfun: fix dithering in MMX code. lavfi/gradfun: fix rounding in MMX code. lavfi/gradfun: do not increment DC pointer for odd values. fate: filter: Add dependencies avconv: add options for reading filtergraphs from a file. Conflicts: Changelog doc/ffmpeg.texi doc/filters.texi ffmpeg.h ffmpeg_opt.c libavfilter/vf_gradfun.c tests/fate/filter.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-23ffmpeg: Correct inter stream timestamp discontinuitiesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer
* commit '354468fc12dcf93e7fb4af552e18906771913273': avplay: switch to new refcounted frames API avconv: convert to new refcounted AVFrame API Conflicts: cmdutils.c ffmpeg.c ffmpeg.h ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-10ffmpeg: add the -canvas_size option.Nicolas George
Allows, amongst other things, to override the size guessed by the sub2video hack. Note: the -s option could have more or less the same semantic, but it receives a special treatment by the options system.
2013-03-10ffmpeg: port sub2video to AVFrame.Nicolas George
And re-enable the FATE test.
2013-02-27ffmpeg_opt: add -to option to specify stop timeJean First
Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-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-01-27ffmpeg: implement -force_key_frames expression evalutionStefano Sabatini
2013-01-26ffmpeg: add -guess_layout_max option.Nicolas George
2012-12-20Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-12ffmpeg: sub2video: use start and end time.Nicolas George
Until now, the end_display_time was ignored, making single packets subtitles (like dvdsub) stay indefinitely. start_display_time was also ignored, but is it almost always 0.
2012-11-26ffmpeg: fix swr filter_type for auto inserted aresample filtersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27ffmpeg: use av_rescale_delta() on the audio filter inputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 05:32:29 +0300