summaryrefslogtreecommitdiffstats
path: root/ffmpeg.h
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'Michael Niedermayer2013-11-231-0/+3
| | | | | | | | | | | | | * commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea': avconv: add support for VDPAU decoding Conflicts: Changelog Makefile configure ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '07fd0a22192805d56c635eb294dc26b0a54ae325'Michael Niedermayer2013-11-231-0/+31
| | | | | | | | | | | | | * 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: Do not fill gap before the first decodable frame on single stream ↵Michael Niedermayer2013-11-161-0/+2
| | | | | | | | | | | | | 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>
* ffmpeg: store value of -filter and -filter_script per-stream option in ↵Stefano Sabatini2013-11-091-0/+2
| | | | | | | OutputStream struct Avoid the need for multiple potentially inconsistent access operations, slightly factorize code.
* Merge commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29'Michael Niedermayer2013-10-291-0/+2
| | | | | | | | | | * commit 'c872d310cd9c605e5f994ad8ac79dc72303c0d29': avconv: stop accessing AVStream.parser Conflicts: ffmpeg.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add max_error_rate to allow tuning the point decoding errors are ↵Michael Niedermayer2013-10-071-0/+1
| | | | | | | considered a failure of the whole transcoding. Suggested-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7'Michael Niedermayer2013-08-061-0/+1
| | | | | | | | | | | * 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-061-0/+3
| | | | | | | | | | | | | * 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>
* ffmpeg: add -apad option which injects a apad filter only in the presence of ↵Michael Niedermayer2013-05-081-0/+3
| | | | | | video streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-05-031-0/+2
| | | | | | | | | | * qatar/master: avconv: do not send non-monotonous DTS to the muxers. Conflicts: ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '38f0c0781a6e099f11c0acec07f9b8be742190c4'Michael Niedermayer2013-04-111-1/+0
| | | | | | | | | | | | | | | * 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>
* ffmpeg: use a rational for -aspect option.Nicolas George2013-04-091-1/+1
|
* Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'Michael Niedermayer2013-03-281-0/+2
| | | | | | | | | | | | | | | | | | | | | * 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>
* ffmpeg: Correct inter stream timestamp discontinuitiesMichael Niedermayer2013-03-231-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '354468fc12dcf93e7fb4af552e18906771913273'Michael Niedermayer2013-03-121-2/+1
| | | | | | | | | | | | | | * 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>
* ffmpeg: add the -canvas_size option.Nicolas George2013-03-101-0/+2
| | | | | | | | 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.
* ffmpeg: port sub2video to AVFrame.Nicolas George2013-03-101-1/+1
| | | | And re-enable the FATE test.
* ffmpeg_opt: add -to option to specify stop timeJean First2013-02-271-0/+1
| | | | | Signed-off-by: Jean First <jeanfirst@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Force a first_pts of 0 for the first configuration of -async useMichael Niedermayer2013-02-251-0/+1
| | | | | | This is very close to what the default does currently Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use a AVDictionary instead of the context to move swr parameters aroundMichael Niedermayer2013-02-241-3/+1
| | | | | | | This avoids per parameter changes in ffmpeg at the cost of making access somewhat more annoying. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'Michael Niedermayer2013-02-241-0/+1
| | | | | | | | | | | | | * 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>
* ffmpeg: implement -force_key_frames expression evalutionStefano Sabatini2013-01-271-0/+14
|
* ffmpeg: add -guess_layout_max option.Nicolas George2013-01-261-0/+3
|
* Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'Michael Niedermayer2012-12-201-0/+4
| | | | | | | | | | | | * commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06': avconv: use new options parser. Conflicts: ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: sub2video: use start and end time.Nicolas George2012-12-121-0/+1
| | | | | | | 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.
* ffmpeg: fix swr filter_type for auto inserted aresample filtersMichael Niedermayer2012-11-261-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use av_rescale_delta() on the audio filter inputMichael Niedermayer2012-10-271-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: Make video filter graph reinit user selectableMichael Niedermayer2012-10-171-0/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be'Michael Niedermayer2012-10-131-2/+2
| | | | | | | | | | | | | | * commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be': Remove libmpeg2 #define remnants De-doxygenize some top-level files Conflicts: ffmpeg.c ffmpeg.h ffmpeg_filter.c ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2'Michael Niedermayer2012-10-101-2/+0
| | | | | | | | | | | | | | * commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2': avconv: remove -same_quant Conflicts: Changelog doc/faq.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add option to control copying of frames prior to start.Michael Niedermayer2012-09-271-0/+3
| | | | | | | | | | | Normally we discard things prior to the intended start for stream copy this is not always possible, and its not done by default this option allows discarding to be enabled this is primarely usefull when transcoding a video and stream copying an audio stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: use PTS from the AVSubtitle structure.Nicolas George2012-09-151-1/+0
|
* Merge commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5'Michael Niedermayer2012-08-311-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec36aa69448f20a78d8c4588265022e0b2272ab5': x86: Fix linking with some or all of yasm, mmx, optimizations disabled configure: Add more fine-grained SSE CPU capabilities flags avfilter: x86: Use more precise compile template names x86: cosmetics: Comment some #endifs for better readability g723_1: add comfort noise generation utvideoenc: Switch to dsputils' median prediction utvideoenc: Avoid writing into the input picture avtools: remove the distinction between func_arg and func2_arg. avconv: make the -passlogfile option per-stream. avconv: make the -pass option per-stream. cmdutils: make -codecs print lossy/lossless flags. lavc: add lossy/lossless codec properties. Conflicts: Changelog cmdutils.c configure doc/APIchanges ffmpeg.h ffmpeg_opt.c ffprobe.c libavcodec/codec_desc.c libavcodec/g723_1.c libavcodec/utvideoenc.c libavcodec/version.h libavcodec/x86/mpegaudiodec.c libavcodec/x86/rv40dsp_init.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: don't use deprecated avcodec_encode_video(). cmdutils: refactor -codecs option. avconv: make -shortest a per-output file option. lavc: add avcodec_descriptor_get_by_name(). lavc: add const to AVCodec* function parameters. swf(dec): replace CODEC_ID with AV_CODEC_ID dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE rtmpdh: Do not generate the same private key every time when using libnettle rtp: remove ff_rtp_get_rtcp_file_handle(). rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle() avio: add (ff)url_get_multi_file_handle() for getting more than one fd h264: vdpau: fix crash with unsupported colorspace amrwbdec: Decode the fr_quality bit properly Conflicts: Changelog cmdutils.c cmdutils_common_opts.h doc/ffmpeg.texi ffmpeg.c ffmpeg.h ffmpeg_opt.c libavcodec/h264.c libavcodec/options.c libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: add an option to fix subtitles durations.Nicolas George2012-08-141-0/+10
| | | | With this option, transcoding DVB subtitles becomes possible.
OpenPOWER on IntegriCloud