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
2015-09-05Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'Hendrik Leppkes
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c': lavc: Drop deprecated request_channels related functions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-28lavc: Drop deprecated request_channels related functionsVittorio Giovara
Deprecated in 04/2011.
2015-08-24options_table: fix compatibility with MSVCAndreas Cadhalpun
Including libavutil/internal.h breaks compilation of doc/print_options.c with MSVC due to linking avpriv_strtod/avpriv_snprintf. This reverts part of commit 095347f. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-22disable deprecation warnings in deprecated codeAndreas Cadhalpun
Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
2015-08-18Prepare for removal of obsolete FF_IDCT_* members.Ronald S. Bultje
2015-07-27Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec flagsVittorio Giovara
Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27lavc: Deprecate avctx.me_methodVittorio Giovara
This option is extremely codec specific and only a few codecs employ it. Move it to codec private options instead: mpegenc family supports only 3 values, xavs and x264 use 5, and xvid has a different metric entirely. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-27Merge commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6'Michael Niedermayer
* commit '4b6b1082a73907c7c3de2646c6398bc61320f2c6': lavc: Deprecate avctx.me_method Conflicts: doc/encoders.texi libavcodec/avcodec.h libavcodec/libx264.c libavcodec/motion_est.c libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-09Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'Michael Niedermayer
* commit '1761ab838c75223a6b97d8c0720d09275374c53d': lavc: Deprecate avctx.rc_strategy Conflicts: libavcodec/mpegvideo.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-08lavc: Deprecate avctx.rc_strategyVittorio Giovara
Only used by libxvid in ratecontrol module, so move it to a codec private option. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-03lavc: Move deprecation warning disabling to files including the tableVittorio Giovara
Unbreak build from 7a5902c556d84a367dd64a003a4e7244fc3a73d1. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-03lavc: Disable deprectation warnings coming from options tableVittorio Giovara
2015-07-03Merge commit '910247f1720c6aae422723c05dac6d0b19f20bec'Michael Niedermayer
* commit '910247f1720c6aae422723c05dac6d0b19f20bec': lavc: Deprecate avctx.{inter,intra}_quant_bias Conflicts: libavcodec/mpegvideo_enc.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-03lavc: Deprecate avctx.{inter,intra}_quant_biasVittorio Giovara
They are used by dnxhd and mpegvideo_enc exclusively, move them to codec private options instead. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-01Merge commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e'Michael Niedermayer
* commit '3f872c9bfa8ee1032058cfa48068b5a73ef27b5e': lavc: Add missing API guard to dtg_active_format option Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-01lavc: Add missing API guard to dtg_active_format optionVittorio Giovara
2015-07-01avcodec/h264: Greenmetadata SEI parsingNicolas DEROUINEAU
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-09avcodec/options_table: remove extradata_size from the AVOptions tableMichael Niedermayer
allowing access to the size but not the extradata itself is not useful and could lead to potential problems if writing happens through this field Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27Merge commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9'Michael Niedermayer
* commit 'e44b58924fe7b180bf8b0c277c15d1a58210a0e9': lavc: deprecate unused AVCodecContext.stream_codec_tag Conflicts: libavcodec/mpegvideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27lavc: deprecate unused AVCodecContext.stream_codec_tagAnton Khirnov
2015-01-11avcodec/options_table: add entries for MPEG4 video profilesMichael Niedermayer
Fixes part of Ticket2901 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02options_table: fix colorspace minimum option valueJon Morley
The min value for colorspace should be zero and not one since the first valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0.
2014-11-16lavc/options: set timecode_frame_start to -1 as option defaultLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-16lavc/options_table: add pixel_format and video_size optionsLukasz Marek
Adding these options simplify ffm format implementation based on AVOption API. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-16lavc/options_table: set min to -1 for timecode_frame_startLukasz Marek
timecode_frame_start is set to -1 in avcodec_get_context_defaults3() AVOptions API complains about it. Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-10options_table.h: min value for colorspace is 0 (AVCOL_SPC_RGB)Jon Morley
The min value for colorspace should be zero and not one since the first valid index into the frame colorspace array is AVCOL_SPC_RGB which is 0. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-03avcodec/options_table fix min of audio channels and sample rateMichael Niedermayer
Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24avcodec/options_table: Fix codec_whitelist flagsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-19avcodec: add codec_whitelistMichael Niedermayer
This allows restricting decoders to a list of needed ones for improved security Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45'Michael Niedermayer
* commit '530c1441fd1426b6a4bb33485ff3226e1ae0ad45': lavc: make lmax/lmin into private options of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40'Michael Niedermayer
* commit '15ec053c4c0b198a2e93eb8e60c8f41e091e0c40': lavc: make border_masking into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866'Michael Niedermayer
* commit 'c4f7bee0872d5e2e0e91673dd4b0f18de4a3d866': lavc: deprecate unused mb_threshold field Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283'Michael Niedermayer
* commit '59b55c494e01de09dfd7cbf9cbbe7223265ac283': lavc: deprecate unused me_threshold field Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6'Michael Niedermayer
* commit '66a68ddd1ac376b24db8695058bc8fc28f5bada6': lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit 'a75c2eb25a62105c09b48521aef429dc8a231637'Michael Niedermayer
* commit 'a75c2eb25a62105c09b48521aef429dc8a231637': lavc: make rc_eq into private options of mpegvideo encoders Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit '946f95354ba76ef73c9b66889d86ab5fba4fb486'Michael Niedermayer
* commit '946f95354ba76ef73c9b66889d86ab5fba4fb486': lavc: make rc_qmod_* into private options of mpegvideo encoders Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18Merge commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf'Michael Niedermayer
* commit 'a6e4ce9fd50897dc6d9c2ada4b6b8090de7de5bf': lavc: make rc_qsquish a private option of mpegvideo encoders Conflicts: libavcodec/avcodec.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18lavc: make lmax/lmin into private options of mpegvideo encodersAnton Khirnov
2014-10-18lavc: make border_masking into private options of mpegvideo encodersAnton Khirnov
2014-10-18lavc: deprecate unused mb_threshold fieldAnton Khirnov
2014-10-18lavc: deprecate unused me_threshold fieldAnton Khirnov
2014-10-18lavc: make rc_buffer_aggressivity/rc_initial_cplx into private options of ↵Anton Khirnov
mpegvideo encoders
2014-10-18lavc: make rc_eq into private options of mpegvideo encodersAnton Khirnov
2014-10-18lavc: make rc_qmod_* into private options of mpegvideo encodersAnton Khirnov
2014-10-18lavc: make rc_qsquish a private option of mpegvideo encodersAnton Khirnov
2014-10-09Merge commit '586ea0379c207a942c1f2d61e0b3a63c458cc598'Michael Niedermayer
* commit '586ea0379c207a942c1f2d61e0b3a63c458cc598': avcodec: fix colorspace option description Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09Merge commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b'Michael Niedermayer
* commit '91eef402037ae5a51d89ade6cb71cdd70b291c8b': avcodec: add enum values on chroma sample location Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09Merge commit '9d5fed6dc4cccb0689f694112f5026988bebc472'Michael Niedermayer
* commit '9d5fed6dc4cccb0689f694112f5026988bebc472': avcodec: fix descriptions on color transfer options Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-09avcodec: Allow choosing the dump format field separator.Michael Niedermayer
The default is to maintain the previous ", " for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>