summaryrefslogtreecommitdiff
path: root/libavcodec/mjpegenc.h
Commit message (Collapse)AuthorAgeFilesLines
* avcodec/mjpegenc: move ff_mjpeg_encode_picture_frame to mjpegenc_commonJames Almer2017-05-081-1/+0
| | | | Fixes compilation of ljpeg encoder if mjpeg and amv encoders are disabled
* avcodec/mjpegenc: Revert some differences in ff_mjpeg_encode_mb() relative ↵Michael Niedermayer2017-02-101-1/+1
| | | | | | | | 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>
* avcodec/mjpegenc: Remove non functional huffman reallocation and error handlingMichael Niedermayer2017-02-101-2/+0
| | | | | | | 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>
* Implement optimal huffman encoding for (M)JPEG.Jerry Jiang2017-02-081-9/+59
| | | | | | | > seems to break > make fate-vsynth1-mjpeg-444 Fixed.
* Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-211-1/+1
|\ | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-041-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'Michael Niedermayer2015-03-311-1/+2
|\ \ | |/ | | | | | | | | | | * commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5': mjpeg: Use a more precise type for put_marker() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Use a more precise type for put_marker()Diego Biurrun2015-03-301-1/+2
| |
* | Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'Michael Niedermayer2015-03-301-0/+7
|\ \ | |/ | | | | | | | | | | | | | | | | * commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80': mjpeg: Move code only used in the encoder(s) to the appropriate header Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mjpeg: Move code only used in the encoder(s) to the appropriate headerDiego Biurrun2015-03-301-0/+7
| |
| * mjpegenc: fix argument size in encode_mbVittorio Giovara2014-11-111-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 1047235
* | Merge commit 'adcb8392c9b185fd8a91a95fa256d15ab1432a30'Michael Niedermayer2014-07-011-10/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-7/+0
| | | | | | | | This obviates a dependency of the LJPEG encoder on mpegvideo.
* | 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: pass chroma quantization matrix through as well, not just lumaMichael Niedermayer2014-01-111-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpeg/ljpegenc: factor ff_mjpeg_init_hvsample() outMichael Niedermayer2013-12-061-0/+1
| | | | | | | | | | | | This reduces the amount of duplicated code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegenc: make escape_FF() non staticMichael Niedermayer2013-12-061-0/+1
| | | | | | | | | | | | This will be used by ljpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '86eb2eaac629909d6ee4067c6f1e485a4e70473d'Michael Niedermayer2013-12-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-1/+1
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '3360ad995530ea6967b1e83981b4aa8240fbb0ed'Michael Niedermayer2013-12-061-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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-1/+1
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '058d5f2feb730846f22c1812e433f92f670ad751'Michael Niedermayer2013-12-061-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-1/+3
| | | | | | | | This will allow deMpegEncContextizing the LJPEG encoder.
* | Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer2013-01-231-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-221-2/+3
| | | | | | | | | | | | It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | mjpegenc: support slice multithreadingMichael Niedermayer2012-06-141-1/+1
|/ | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | Passing an explicit filename to this command is only necessary if the documentation in the @file block refers to a file different from the one the block resides in. Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Group all copyright and author notices together.Diego Biurrun2007-07-051-4/+4
| | | | Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a proper prefix to all mjpeg encoder exported functionsAurelien Jacobs2007-05-181-8/+8
| | | | Originally committed as revision 9058 to svn://svn.ffmpeg.org/ffmpeg/trunk
* split ljpeg encoder out of mjpeg.cAurelien Jacobs2007-05-181-0/+60
Originally committed as revision 9057 to svn://svn.ffmpeg.org/ffmpeg/trunk