summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegenc.c
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/mjpegenc: use av_freep(), avoid leaving stale pointers in memoryMichael Niedermayer2014-10-311-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegenc: add priv_class to encodersMichael Niedermayer2014-10-181-0/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mjpegenc: the AMV encoder doesnt support yuv422Michael Niedermayer2014-09-141-1/+1
| | | | | | Fixes Ticket3883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer2014-08-151-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun2014-08-151-3/+3
| |
| * mjpeg: return proper error codeNidhi Makhijani2014-07-211-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer2014-07-011-349/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
| * mjpeg: Split off bits shared by MJPEG and LJPEG encodersDiego Biurrun2014-06-301-285/+1
| | | | | | | | This obviates a dependency of the LJPEG encoder on mpegvideo.
* | avcodec/mjpegenc: allow encoding amv with height % 16 != 0 when strict -1 is setMichael Niedermayer2014-06-011-4/+6
| | | | | | | | | | | | | | This should make it simpler for users to test if such videos work Suggested-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix nonsense non-mod16 AMV flipping code.Reimar Döffinger2014-06-011-1/+1
| | | | | | | | | | | | | | | | | | 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>
* | avcodec/mjpegenc: disallow encoding amv with height%16!=0Michael Niedermayer2014-06-011-0/+7
| | | | | | | | | | | | | | 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>
* | avcodec/mjpegen: Fix declared argument sizeMichael Niedermayer2014-04-161-1/+1
| | | | | | | | | | | | Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()Michael Niedermayer2014-01-241-2/+1
| | | | | | | | | | | | | | This avoids the need for double error checking Fixes CID1163843 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: use a seperate chroma matrix when luma and chroma differMichael Niedermayer2014-01-111-28/+18
| | | | | | | | | | | | drop hardcoded TWOMATRIX code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: pass chroma quantization matrix through as well, not just lumaMichael Niedermayer2014-01-111-6/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/mjpegenc: use proper error codes.Nicolas George2013-12-301-3/+3
| |
* | lavc/mjpegenc: check av_frame_alloc() failure.Nicolas George2013-12-301-0/+2
| |
* | avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)Michael Niedermayer2013-12-171-5/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() outMichael Niedermayer2013-12-061-6/+12
| | | | | | | | | | | | This reduces the amount of duplicated code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc/ff_mjpeg_escape_FF: remove unused variableMichael Niedermayer2013-12-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'Michael Niedermayer2013-12-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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>
| * ljpegenc: accept bgr24 instead of bgraAnton Khirnov2013-12-051-2/+2
| | | | | | | | The alpha plane is not encoded.
* | avcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header()Michael Niedermayer2013-12-061-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer2013-12-061-8/+15
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | avcodec/mjpegenc: move end padding/alignment to ff_mjpeg_escape_FF()Michael Niedermayer2013-12-061-5/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: make escape_FF() non staticMichael Niedermayer2013-12-061-2/+2
| | | | | | | | | | | | This will be used by ljpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'Michael Niedermayer2013-12-061-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc() Conflicts: libavcodec/mjpegenc.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_dc()Anton Khirnov2013-12-051-6/+6
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer2013-12-061-11/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_trailer()Anton Khirnov2013-12-051-11/+11
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer2013-12-061-50/+79
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '058d5f2feb730846f22c1812e433f92f670ad751': mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header() Conflicts: libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to ff_mjpeg_encode_picture_header()Anton Khirnov2013-12-051-44/+67
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'Michael Niedermayer2013-12-061-8/+10
|\ \ | |/ | | | | | | | | | | * commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7': mjpegenc: do not pass MpegEncContext to jpeg_table_header() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to jpeg_table_header()Anton Khirnov2013-12-051-5/+5
| | | | | | | | | | Pass the three needed fields from it directly. This will allow to deMpegEncContextize the LJPEG encoder.
| * mjpegenc: remove commented out never-to-be-finished WIP cruftAnton Khirnov2013-12-051-25/+0
| |
* | Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'Michael Niedermayer2013-12-061-6/+5
|\ \ | |/ | | | | | | | | | | * commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9': mjpegenc: do not pass MpegEncContext to put_huffman_table() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: do not pass MpegEncContext to put_huffman_table()Anton Khirnov2013-12-051-6/+5
| | | | | | | | It only needs PutBitContext from it, so pass that directly.
* | Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'Michael Niedermayer2013-12-061-15/+14
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'a1ba1f20b350cb89e645f17bdb237d027170db33': mjpegenc: cosmetics, reformat jpeg_put_comments() Conflicts: libavcodec/mjpegenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpegenc: cosmetics, reformat jpeg_put_comments()Anton Khirnov2013-12-051-15/+14
| |
* | Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'Michael Niedermayer2013-12-061-10/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
| * mjpegenc: write the JFIF header if the sample aspect ratio is setAnton Khirnov2013-12-051-10/+9
| | | | | | | | | | MpegEncContext.aspect_ratio_info is never set for mjpeg, so this was never written before.
* | avcodec/mjpegenc: use av_log2_16bit() in encode_block()Michael Niedermayer2013-12-051-1/+1
| | | | | | | | | | | | This reduces the number of operations done per non zero coefficient Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cosmetics: group remaining .name and .long_name.Clément Bœsch2013-10-041-1/+1
| | | | | | | | See b2bed9325.
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-041-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-031-1/+1
| |
| * avcodec: Remove some commented-out debug cruftDiego Biurrun2013-08-201-1/+0
| |
* | avcodec/mjpegenc: dont store DQT for LJPEGMichael Niedermayer2013-09-241-0/+2
| | | | | | | | | | | | | | This may improve compatibility of lgpegs generated by libavcodec also encoded ljpegs become slightly smaller Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'Michael Niedermayer2013-02-261-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f': Remove unnecessary dsputil.h #includes Conflicts: libavcodec/ffv1.c libavcodec/h261dec.c libavcodec/h261enc.c libavcodec/h264pred.c libavcodec/lpc.h libavcodec/mjpegdec.c libavcodec/rectangle.h libavcodec/x86/idct_sse2_xvid.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unnecessary dsputil.h #includesDiego Biurrun2013-02-261-1/+0
| |
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-231-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f': Drop DCTELEM typedef Conflicts: libavcodec/alpha/dsputil_alpha.h libavcodec/alpha/motion_est_alpha.c libavcodec/arm/dsputil_init_armv6.c libavcodec/bfin/dsputil_bfin.h libavcodec/bfin/pixels_bfin.S libavcodec/cavs.c libavcodec/cavsdec.c libavcodec/dct-test.c libavcodec/dnxhdenc.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/eamad.c libavcodec/h264_cavlc.c libavcodec/h264idct_template.c libavcodec/mpeg12.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/ppc/dsputil_altivec.c libavcodec/proresdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status