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
2018-11-05mjpeg: Use profile names in the encoder and decoderVittorio Giovara
2017-10-23Merge commit 'b3739599bda740ac12d3dde31a331b744df99123'James Almer
* commit 'b3739599bda740ac12d3dde31a331b744df99123': lavc: Drop deprecated emu edge functionality Merged-by: James Almer <jamrial@gmail.com>
2017-08-11avcodec/mjpegenc: cosmetic changesDavinder Singh
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-08-11avcodec/mjpegenc: disable unused code with AMVDavinder Singh
disable unused amv_encode_picture() when AMV encoder is not configured. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-08avcodec/mjpegenc: move ff_mjpeg_encode_picture_frame to mjpegenc_commonJames Almer
Fixes compilation of ljpeg encoder if mjpeg and amv encoders are disabled
2017-04-09mjpegenc: enable optimal huffman coding by defaultRostislav Pehlivanov
As it gives excellent encoding gains at an insignificant speed increase and passes fate without problems, it should now be safe to enable by default. Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-02-10avcodec/mjpegenc: Bypass the 2 pass encoding when optimal tables are not ↵Michael Niedermayer
requested This limits the bugs, speedloss and extra memory allocation to the case when optimal tables are needed. Fixes regressions with slice multi-threading Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-10avcodec/mjpegenc: Revert some differences in ff_mjpeg_encode_mb() relative ↵Michael Niedermayer
to pre optimal huffman The changes are not needed anymore and the return code was never used Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-10avcodec/mjpegenc: Drop i_tex misuse, set itex/header bits correctly, fix ↵Michael Niedermayer
2pass encoding Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-10avcodec/mjpegenc: Remove non functional huffman reallocation and error handlingMichael Niedermayer
If this is wanted iam not against it but it must be designed to work with all cases like slice threads, and a single growing buffer does not work very well with slices. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-02-09mjpegenc: use s->avctx as a context for av_log rather than NULLRostislav Pehlivanov
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-02-09mjpegenc_common: add missing ff_ prefix to init_uni_ac_vlcRostislav Pehlivanov
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2017-02-08Implement optimal huffman encoding for (M)JPEG.Jerry Jiang
> seems to break > make fate-vsynth1-mjpeg-444 Fixed.
2016-05-03Drop pointless assert.h #includesDiego Biurrun
2016-02-04mjpegenc: Remove duplicate initializerDerek Buitenhuis
This was causing c99conv to crash. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-03Merge commit '2862b63783b5556f7f3fb2d097629bc6879f833a'Derek Buitenhuis
* commit '2862b63783b5556f7f3fb2d097629bc6879f833a': lavc: Move prediction_method to codec private options Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-01-21lavc: Move prediction_method to codec private optionsVittorio Giovara
This options is only used by huffyuv, ffvhuv, jpegls, mjpeg, mpegvideoenc, png, utvideo. It is a very codec-specific options, so deprecate the global variant. Set proper limits to the maximum allowed values, and update utvideoenc tests to use the new option name. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-08-28Put remaining pieces of CODEC_FLAG_EMU_EDGE under FF_API_EMU_EDGE.Ronald S. Bultje
The amv one probably looks suspicious, but since it's an intra-only codec, I couldn't possibly imagine what it would use the edge for, and the vsynth fate result doesn't change, so it's probably OK.
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-06-12Merge commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd'Michael Niedermayer
* commit 'f1fa1eed2abdc8dfb0af318a43f5d293b81141bd': mpegvideo: Expand macro Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-31Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'Michael Niedermayer
* commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8': build: Split JPEG-related tables off into a separate component Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30build: Split JPEG-related tables off into a separate componentDiego Biurrun
2015-02-27avcodec/mjpegenc: Mark ff_mjpeg_encode_close() as av_coldMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11avcodec/mjpegenc: support trellis quantizationMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-11mjpegenc: fix argument size in encode_mbVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1047235
2014-10-31avcodec/mjpegenc: use av_freep(), avoid leaving stale pointers in memoryMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-18avcodec/mjpegenc: add priv_class to encodersMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-14avcodec/mjpegenc: the AMV encoder doesnt support yuv422Michael Niedermayer
Fixes Ticket3883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer
* commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun
2014-07-21mjpeg: return proper error codeNidhi Makhijani
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-07-01Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer
* commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30': mjpeg: Split off bits shared by MJPEG and LJPEG encoders Conflicts: libavcodec/mjpegenc.c libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-30mjpeg: Split off bits shared by MJPEG and LJPEG encodersDiego Biurrun
This obviates a dependency of the LJPEG encoder on mpegvideo.
2014-06-01avcodec/mjpegenc: allow encoding amv with height % 16 != 0 when strict -1 is setMichael Niedermayer
This should make it simpler for users to test if such videos work Suggested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01Fix nonsense non-mod16 AMV flipping code.Reimar Döffinger
It is obviously nonsense since it produces wrong results or even crashes (crashes should be encode-only though). Fixes trac issue #1092. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-01avcodec/mjpegenc: disallow encoding amv with height%16!=0Michael Niedermayer
I do not know on which side to place the padding to encode with 16x16 MBs If someone knows or has a known to be correct sample, please contact me Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-16avcodec/mjpegen: Fix declared argument sizeMichael Niedermayer
Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-24avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()Michael Niedermayer
This avoids the need for double error checking Fixes CID1163843 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12avcodec/mjpegenc: use a seperate chroma matrix when luma and chroma differMichael Niedermayer
drop hardcoded TWOMATRIX code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-12avcodec/mjpegenc: pass chroma quantization matrix through as well, not just lumaMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-30lavc/mjpegenc: use proper error codes.Nicolas George
2013-12-30lavc/mjpegenc: check av_frame_alloc() failure.Nicolas George
2013-12-17avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() outMichael Niedermayer
This reduces the amount of duplicated code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/mjpegenc/ff_mjpeg_escape_FF: remove unused variableMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'Michael Niedermayer
* commit 'daffed3b173c59d64907747bf3309e98a8974f4e': ljpegenc: accept bgr24 instead of bgra Conflicts: libavcodec/ljpegenc.c libavcodec/mjpegenc.c Only whitespace merged, we continue to support both formats Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer
* commit '24abd806ea0cfb0d988d2f0044eac79cff12918c': ljpegenc: deMpegEncContextize Conflicts: libavcodec/ljpegenc.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c tests/ref/vsynth/vsynth1-ljpeg tests/ref/vsynth/vsynth2-ljpeg Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06avcodec/mjpegenc: make escape_FF() non staticMichael Niedermayer
This will be used by ljpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>