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-08-18libx264: Add option to force IDR framesDerek Buitenhuis
Currently, when forcing an I frame, via API, or via the ffmpeg cli, using -force_key_frames, we still let x264 decide what sort of keyframe to user. In some cases, it is useful to be able to force an IDR frame, e.g. for cutting streams. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-08-01avcodec/libx264: expose nv21 input supportYu Xiaolei
libx264 added support for NV21 input recently. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
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 capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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-27avcodec: Add a min size parameter to ff_alloc_packet2()Michael Niedermayer
This parameter can be used to inform the allocation code about how much downsizing might occur, and can be used to optimize how to allocate the packet Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22avcodec/libx264: Export choosen pict_typeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22Replace AV_PKT_DATA_QUALITY_FACTOR by AV_PKT_DATA_QUALITY_STATSMichael Niedermayer
The stats are a superset of the quality factor, also allowing the picture type and encoder "PSNR" stats to be exported This also replaces the native by fixed little endian order for the affected side data AV_PKT_DATA_QUALITY_FACTOR is left as a synonym of AV_PKT_DATA_QUALITY_STATS Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-21Merge commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370'Michael Niedermayer
* commit '40cf1bbacc6220a0aa6bed5c331871d43f9ce370': Deprecate avctx.coded_frame Conflicts: ffmpeg.c libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/gif.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/proresenc_kostya.c libavcodec/pthread_frame.c libavcodec/rawenc.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/version.h libavcodec/xbmenc.c libavcodec/xwdenc.c libavdevice/v4l2.c Merged-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-21Merge commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534'Michael Niedermayer
* commit 'd6604b29ef544793479d7fb4e05ef6622bb3e534': Gather all coded_frame allocations and free functions to a single place Conflicts: libavcodec/a64multienc.c libavcodec/asvenc.c libavcodec/cljrenc.c libavcodec/dpxenc.c libavcodec/dvenc.c libavcodec/gif.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libopenjpegenc.c libavcodec/libtheoraenc.c libavcodec/libvpxenc.c libavcodec/mpegvideo_enc.c libavcodec/nvenc.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/sunrastenc.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/v210enc.c libavcodec/v410enc.c libavcodec/xbmenc.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-20Deprecate avctx.coded_frameVittorio Giovara
The rationale is that coded_frame was only used to communicate key_frame, pict_type and quality to the caller, as well as a few other random fields, in a non predictable, let alone consistent way. There was agreement that there was no use case for coded_frame, as it is a full-sized AVFrame container used for just 2-3 int-sized properties, which shouldn't even belong into the AVCodecContext in the first place. The appropriate AVPacket flag can be used instead of key_frame, while quality is exported with the new AVPacketSideData quality factor. There is no replacement for the other fields as they were unreliable, mishandled or just not used at all. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20Add a quality factor packet side dataVittorio Giovara
This is necessary to preserve the quality information currently exported with coded_frame. Add the new side data to every encoder that needs it, and use it in avconv. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-20Gather all coded_frame allocations and free functions to a single placeVittorio Giovara
Allocating coded_frame is what most encoders do anyway, so it makes sense to always allocate and free it in a single place. Moreover a lot of encoders freed the frame with av_freep() instead of the correct API av_frame_free(). This bring uniformity to encoder behaviour and prevents applications from erroneusly accessing this field when not allocated. Additionally this helps isolating encoders that export information with coded_frame, and heavily simplifies its deprecation. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-07-17avcodec/libx264: fix MPEG2 supportMichael Niedermayer
Found-by: rcombs Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17Merge commit 'e1319aa1c1be9b64117c19170344fb78841dd67c'Michael Niedermayer
* commit 'e1319aa1c1be9b64117c19170344fb78841dd67c': libx264: Add support for the MPEG2 encoder Conflicts: configure libavcodec/Makefile libavcodec/libx264.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-17libx264: Add support for the MPEG2 encoderLuca Barbato
2015-06-18avcodec/libx264: Avoid reconfig on equivalent aspect ratiosMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'Michael Niedermayer
* commit '03ca6d70df192125a772dadd01acfe3905aa653f': x264: Factor out the reconfiguration code Conflicts: libavcodec/libx264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-15x264: Factor out the reconfiguration codeLuca Barbato
2015-05-31x264: Check memory allocationVittorio Giovara
2015-05-28lavc/x264: Support bgr0 as input pix_fmt.Carl Eugen Hoyos
2015-04-29avcodec/libx264: Remove cleanup code, its uneeded since ↵Michael Niedermayer
FF_CODEC_CAP_INIT_CLEANUP Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-24Merge commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8'Michael Niedermayer
* commit 'eae7338e1592f4a398b7c3cb9d1ac854b7a44ff8': libx264: Make codec use the init-cleanup flag and mark it as init-thread-safe Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-24libx264: Make codec use the init-cleanup flag and mark it as init-thread-safeVittorio Giovara
This takes care of memory leaks on init error.
2015-04-15x264: Map color parametersLuca Barbato
2015-03-17libx264: Allow full-range yuv422 and yuv444 pixel formatsCarl Eugen Hoyos
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-03-17avcodec/libx264: use AVERROR_EXTERNAL instead of AVERROR_UNKNOWNClément Bœsch
2015-03-13Merge commit '913aa9a4874418724183a3ec862cdc63b829367d'Michael Niedermayer
* commit '913aa9a4874418724183a3ec862cdc63b829367d': libx264: Return more meaningful error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-12libx264: Return more meaningful error codesHimangi Saraogi
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-03-04libx264: update AQ options help for x264 build 144Peter Cordes
Regular autovariance is no longer "experimental", and a version of it with bias towards dark scenes is now in mainline x264. Signed-off-by: Peter Cordes <peter@cordes.ca>
2015-02-22avcodec/libx264: Check for av_malloc() failureMichael Niedermayer
Fixes CID1257813 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-18libavcodec/libx264: Use av_freep() avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-04lavc/libx264: Fix compilation with libx264 version < 142.Carl Eugen Hoyos
2014-10-01avcodec/libx264: add avcintra-classMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-28avcodec/libx264: mark unchanged pointer arguments as constMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-26libx264: fix -b_qfactor and -chromaoffsetHii
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-16Drop remaining unneeded != NULLMichael Niedermayer
Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07Merge commit 'a7e541c9926d531a100ba0d36f4e56956dd84651'Michael Niedermayer
* commit 'a7e541c9926d531a100ba0d36f4e56956dd84651': h264: fix interpretation of interleved stereo modes Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07h264: fix interpretation of interleved stereo modesFelix Abecassis
Column and row frame packing arrangements were inverted. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-06-23Merge commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e'Michael Niedermayer
* commit '0ef256d51518f0e483c38b9ee3b993cf0709d00e': libx264: Correctly manage constant rate factor params Conflicts: libavcodec/libx264.c See: 3a1c8951bc886e8af30e09dc0e20491f6f5c3937 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-22libx264: Correctly manage constant rate factor paramsLuca Barbato
By default they are set to -1.
2014-06-12avcodec/libx264: fix "bitrate reconfiguration"Michael Niedermayer
2014-06-12Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'Michael Niedermayer
* commit '2f4170312f605c1f02a14c01347e94cf46726dbd': libx264: Support bitrate reconfiguration Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-12libx264: Support bitrate reconfigurationLuca Barbato
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2014-05-14avcodec/libx264: Implement reference frame count limiting based on levelMichael Niedermayer
This makes libavcodec/libx264.c behave more similar to the x264 command line util Fixes Ticket3307 Implementation based on x264 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-28avcodec/libx264: move where x264opts is applied down so it isnt overridden ↵Michael Niedermayer
by avctx & defaults fixes x264opts opengop=1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>