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
2016-10-07Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4'Hendrik Leppkes
* commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4': libopenh264enc: Fix inconsistent whitespace Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2016-07-27libopenh264: Support building with the 1.6 releaseMartin Storsjö
This fixes trac issue #5417. This is cherry-picked from libav commit d825b1a5306576dcd0553b7d0d24a3a46ad92864. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-07-27Add an OpenH264 decoder wrapperMartin Storsjö
This is cherrypicked from libav, from commits 82b7525173f20702a8cbc26ebedbf4b69b8fecec and d0b1e6049b06eeeeca146ece4d2f199c5dba1565. Signed-off-by: Martin Storsjö <martin@martin.st>
2016-06-24libopenh264enc: Fix inconsistent whitespaceMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2016-04-17Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'Derek Buitenhuis
* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a': Move const qualifier before type name Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-23Move const qualifier before type nameDiego Biurrun
2016-01-31Merge commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd'Derek Buitenhuis
* commit '936f0d98f864f9f6bb4f9e5458b78537e146bacd': lavc: Move rtp_payload_size to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-01-21lavc: Move rtp_payload_size to codec private optionsVittorio Giovara
This option is only used by mpegvideoenc and openh264. It is a very codec-specific option, so deprecate the global variant. The openh264 option is dropped altogether since it is just a fallback for -max_nal_size anyway. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-12-18Merge commit '81c95eb8eee856d98d4ac37367dbc761f2faf875'Hendrik Leppkes
* commit '81c95eb8eee856d98d4ac37367dbc761f2faf875': openh264: Directly include the deprecation guards header Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-18Merge commit 'be00ec832c519427cd92218abac77dafdc1d5487'Hendrik Leppkes
* commit 'be00ec832c519427cd92218abac77dafdc1d5487': lavc: Deprecate coder_type and its symbols Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-17Merge commit '11c9bd633f635f07a762be1ecd672de55daf4edc'Hendrik Leppkes
* commit '11c9bd633f635f07a762be1ecd672de55daf4edc': libopenh264enc: export CPB props side data Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-12-16lavc/libopenh264: apply minor options text consistency fixesStefano Sabatini
2015-12-08openh264: Directly include the deprecation guards headerLuca Barbato
Make easier to avoid compile failure when reworking the internal headers.
2015-12-07lavc: Deprecate coder_type and its symbolsVittorio Giovara
Most option values are simply unused or ignored and in practice the majory of codecs only need to check whether to enable rle or not. Add appropriate codec private options which better expose the allowed features. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-12-06libopenh264enc: export CPB props side dataAnton Khirnov
2015-11-06libopenh264enc: Set AVOption data typeMichael Niedermayer
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-10-31avcodec/libopenh264enc: use AV_OPT_TYPE_BOOL for allow_skip_frames optionClément Bœsch
2015-10-31avcodec/libopenh264enc: AV_OPT_TYPE_STRING should use .str defaultMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-31avcodec/libopenh264enc: Fix project nameMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-31avcodec/libopenh264enc: set .i64 for AV_OPT_TYPE_INTMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-10-29Merge commit '8edaf625f3c38c695c33745822182e94e17d6e1b'Hendrik Leppkes
* commit '8edaf625f3c38c695c33745822182e94e17d6e1b': libopenh264enc: Count and warn about the number of skipped frames Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-29Merge commit '9e14a992409348630ea96521411127418a92e8a3'Hendrik Leppkes
* commit '9e14a992409348630ea96521411127418a92e8a3': libopenh264enc: Add an option for controlling the frame skipping Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-29libopenh264enc: Count and warn about the number of skipped framesMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-10-29libopenh264enc: Add an option for controlling the frame skippingMartin Storsjö
This allows enabling the frame skipping, which is required for the encoder to properly hit the target bitrate. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-10-10Merge commit 'c3e5c47bdae2bb8219fea62d91b7455650b22c60'Hendrik Leppkes
* commit 'c3e5c47bdae2bb8219fea62d91b7455650b22c60': libopenh264enc: Added max_nal_size option Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-10-09libopenh264enc: Added max_nal_size optionMario Gasparoni
Also added dynamic slice_mode option, needed for the max_nal_size. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-09-29Merge commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc'Hendrik Leppkes
* commit '1a4c5fe56008c61b0362c75bea5d446dc5b256bc': libopenh264enc: Use av_log() to log messages Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29libopenh264enc: Use av_log() to log messagesGregory J. Wolfe
File libopenh264enc.c has been modified so that the encoder uses av_log() to log messages (error, warning, info, etc.) instead of logging them directly to stderr. At the time the encoder is created, the current libav log level is mapped to an equivalent libopenh264 log level. This log level, and a message logging function that invokes av_log() to actually log messages, are then set on the encoder. This contains further changes and simplifications by Michael Niedermayer and Martin Storsjö. Signed-off-by: Martin Storsjö <martin@martin.st>
2015-09-10avcodec/libopenh264enc: use AV_LOG_TRACE instead of DEBUG+1Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-10avcodec/libopenh264enc: Remove some unneeded intermediate variablesMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-10avcodec/libopenh264enc: Fix formating to match FFmpegs styleMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-10avcodec/libopenh264enc: remove useless castMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-10avcodec/libopenh264enc: Use av_log() to log messagesGregory J. Wolfe
File libopenh264enc.c has been modified so that the encoder uses av_log() to log messages (error, warning, info, etc.) instead of logging them directly to stderr. At the time the encoder is created, the current ffmpeg log level is mapped to an equivalent libopenh264 log level. This log level, and a message logging function that invokes av_log() to actually log messages, are then set on the encoder. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-08lavc/libopenh264enc: apply minor consistency fixes to options textStefano Sabatini
2015-08-07avcodec/libopenh264enc: Avoid usage of deprecated ff_alloc_packet()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-28Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer
* commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-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: Consistently prefix input buffer definesVittorio Giovara
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
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-10avcodec/libopenh264enc: Do not truncate frame rateMichael Niedermayer
Suggested-by: Gregory J Wolfe <gregory.wolfe@kodakalaris.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-18Merge commit '58a840e21577a2168843487a98cb2cea44b5a94a'Michael Niedermayer
* commit '58a840e21577a2168843487a98cb2cea44b5a94a': Replace a few leftover instances of enum PixelFormat with enum AVPixelFormat See: ac627b3d38d370027406c93c2dcaac0b1712a7d4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-18Replace a few leftover instances of enum PixelFormat with enum AVPixelFormatMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-03-06Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'Michael Niedermayer
* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770': libopenh264enc: Add support for building with OpenH264 1.4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-06libopenh264enc: Add support for building with OpenH264 1.4Martin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-29Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'Michael Niedermayer
* commit '6996fd204a7f28b46a8c3c97bcf223998218c743': libopenh264: Log debug messages to a non-null context Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-29libopenh264: Log debug messages to a non-null contextMartin Storsjö
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-01-20Merge commit '440119b18836887d98c9e337c5911563bb43588c'Michael Niedermayer
* commit '440119b18836887d98c9e337c5911563bb43588c': libopenh264enc: Move a declaration of a variable into an ifdef Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-20Merge commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e'Michael Niedermayer
* commit 'bba02479260d0e7dec8c530a7e75a1c7aa53c06e': libopenh264enc: Remove a workaround for silencing warnings about unused variables in the OpenH264 header Merged-by: Michael Niedermayer <michaelni@gmx.at>