summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegenc.c
Commit message (Collapse)AuthorAge
* avcodec/mjpegenc: Use av_frame_clone() instead of av_frame_ref()Michael Niedermayer2014-01-24
| | | | | | | 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-11
| | | | | | 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-11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc/mjpegenc: use proper error codes.Nicolas George2013-12-30
|
* lavc/mjpegenc: check av_frame_alloc() failure.Nicolas George2013-12-30
|
* avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)Michael Niedermayer2013-12-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() outMichael Niedermayer2013-12-06
| | | | | | 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-06
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'daffed3b173c59d64907747bf3309e98a8974f4e'Michael Niedermayer2013-12-06
|\ | | | | | | | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | The alpha plane is not encoded.
* | avcodec/mjpegenc: fix and use lossless flag in ff_mjpeg_encode_picture_header()Michael Niedermayer2013-12-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '24abd806ea0cfb0d988d2f0044eac79cff12918c'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: make escape_FF() non staticMichael Niedermayer2013-12-06
| | | | | | | | | | | | This will be used by ljpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '6d70639c7d5fe762c5f18de574eafa817fb53ef7'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * 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-05
| | | | | | | | | | 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-05
| |
* | Merge commit 'ff506c75b71d7aaa1062b49043e0b881b1e263e9'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | * 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-05
| | | | | | | | It only needs PutBitContext from it, so pass that directly.
* | Merge commit 'a1ba1f20b350cb89e645f17bdb237d027170db33'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * 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-05
| |
* | Merge commit '0812f5a40a0a190172b6de6e91755b882472ddc5'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | | | * 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-05
| | | | | | | | | | 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-05
| | | | | | | | | | | | 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-04
| | | | | | | | See b2bed9325.
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-03
| |
| * avcodec: Remove some commented-out debug cruftDiego Biurrun2013-08-20
| |
* | avcodec/mjpegenc: dont store DQT for LJPEGMichael Niedermayer2013-09-24
| | | | | | | | | | | | | | 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-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-26
| |
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Drop DCTELEM typedefDiego Biurrun2013-01-22
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | mjpegenc: fix restart interval parameters for yuv444Michael Niedermayer2012-12-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegenc: fix YUV444 with w%16!=0Michael Niedermayer2012-12-18
| | | | | | | | | | | | Fixes Ticket2040 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegenc: fix 444 block count so it is below 10Michael Niedermayer2012-12-16
| | | | | | | | | | | | Fixes Ticket1990 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegenc: yuvj444p supportPaul B Mahol2012-11-18
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avcodec: Convert some commented-out printf/av_log instances to av_dlog avcodec: Drop silly and/or broken printf debug output avcodec: Drop some silly commented-out av_log() invocations avformat: Convert some commented-out printf/av_log instances to av_dlog avformat: Remove non-compiling and/or silly commented-out printf/av_log statements Remove some silly disabled code. ac3dec: ensure get_buffer() gets a buffer for the correct number of channels Conflicts: libavcodec/dnxhddec.c libavcodec/ffv1.c libavcodec/h264.c libavcodec/h264_parser.c libavcodec/mjpegdec.c libavcodec/motion_est_template.c libavcodec/mpegaudiodec.c libavcodec/mpegvideo_enc.c libavcodec/put_bits.h libavcodec/ratecontrol.c libavcodec/wmaenc.c libavdevice/timefilter.c libavformat/asfdec.c libavformat/avidec.c libavformat/avienc.c libavformat/flvenc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Drop silly and/or broken printf debug outputDiego Biurrun2012-10-01
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: dsputil: Only compile motion_est code when encoders are enabled mem: fix typo in check for __ICC fate: mp3: drop redundant CMP setting rtp: Depacketization of JPEG (RFC 2435) Rename ff_put_string to avpriv_put_string mjpeg: Rename some symbols to avpriv_* instead of ff_* yadif: cosmetics Conflicts: Changelog libavcodec/mjpegenc.c libavcodec/x86/Makefile libavfilter/vf_yadif.c libavformat/version.h libavutil/mem.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Rename ff_put_string to avpriv_put_stringMartin Storsjö2012-09-09
| | | | | | | | | | | | | | This allows using it from libavformat as well. This will be used by the RTP/JPEG depacketizer. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mjpeg: Rename some symbols to avpriv_* instead of ff_*Samuel Pitoiset2012-09-09
| | | | | | | | | | | | These symbols will be used from the RTP/JPEG depacketizer. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 08:59:24 +0000