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
path: root/libavcodec/mjpegenc.c
AgeCommit message (Collapse)Author
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>
2013-12-06Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'Michael Niedermayer
* commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc() Conflicts: libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer
* commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer() Conflicts: libavcodec/ljpegenc.c libavcodec/mjpegenc.c libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer
* commit '058d5f2feb730846f22c1812e433f92f670ad751': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header() Conflicts: libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'Michael Niedermayer
* commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7': mjpegenc: do not pass MpegEncContext to jpeg_table_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'Michael Niedermayer
* commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9': mjpegenc: do not pass MpegEncContext to put_huffman_table() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'Michael Niedermayer
* commit 'a1ba1f20b350cb89e645f17bdb237d027170db33': mjpegenc: cosmetics, reformat jpeg_put_comments() Conflicts: libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-06Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'Michael Niedermayer
* commit '0812f5a40a0a190172b6de6e91755b882472ddc5': mjpegenc: write the JFIF header if the sample aspect ratio is set Conflicts: libavcodec/mjpegenc.c See: f3ce748d3453a490f32a5518f9cf6bef6892a30c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05avcodec/mjpegenc: use av_log2_16bit() in encode_block()Michael Niedermayer
This reduces the number of operations done per non zero coefficient Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-05ljpegenc: accept bgr24 instead of bgraAnton Khirnov
The alpha plane is not encoded.
2013-12-05mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()Anton Khirnov
This will allow deMpegEncContextizing the LJPEG encoder.
2013-12-05mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()Anton Khirnov
This will allow deMpegEncContextizing the LJPEG encoder.
2013-12-05mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()Anton Khirnov
This will allow deMpegEncContextizing the LJPEG encoder.
2013-12-05mjpegenc: do not pass MpegEncContext to jpeg_table_header()Anton Khirnov
Pass the three needed fields from it directly. This will allow to deMpegEncContextize the LJPEG encoder.
2013-12-05mjpegenc: remove commented out never-to-be-finished WIP cruftAnton Khirnov
2013-12-05mjpegenc: do not pass MpegEncContext to put_huffman_table()Anton Khirnov
It only needs PutBitContext from it, so pass that directly.
2013-12-05mjpegenc: cosmetics, reformat jpeg_put_comments()Anton Khirnov
2013-12-05mjpegenc: write the JFIF header if the sample aspect ratio is setAnton Khirnov
MpegEncContext.aspect_ratio_info is never set for mjpeg, so this was never written before.
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 23:55:27 +0300