summaryrefslogtreecommitdiff
path: root/libavcodec/jpegls.h
Commit message (Collapse)AuthorAgeFilesLines
* Define ff_log2_run[] in libavcodec/internal.h.Carl Eugen Hoyos2014-03-101-2/+1
| | | | | This avoids defining the array with different sizes in different source files.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-171-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegvideo_enc: use the AVFrame API properly. ffv1: use the AVFrame API properly. jpegls: use the AVFrame API properly. huffyuv: use the AVFrame API properly. Conflicts: libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Changes to ffv1 are more redone than merged due to them being based on an ancient codebase and a good part of that having being done already as well. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpegls: use the AVFrame API properly.Anton Khirnov2013-11-161-1/+0
| |
* | Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'Michael Niedermayer2013-05-161-33/+45
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec': jpegls: K&R formatting cosmetics Conflicts: libavcodec/jpegls.c libavcodec/jpegls.h libavcodec/jpeglsdec.c libavcodec/jpeglsenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * jpegls: K&R formatting cosmeticsLuca Barbato2013-05-161-33/+45
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | jpegls: increase run_index to 4Michael Niedermayer2012-10-131-1/+1
| | | | | | | | | | Fixes part of CID717913 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-161-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix even more missing includes after the common.h removal build: Factor out rangecoder dependencies to CONFIG_RANGECODER build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE x86: avcodec: Consistently name all init files Add more missing includes after removing the implicit common.h Add some more missing includes after removing the implicit common.h Don't include common.h from avutil.h rtmp: Automatically compute the hash for SWFVerification Conflicts: configure doc/APIchanges doc/examples/decoding_encoding.c libavcodec/Makefile libavcodec/assdec.c libavcodec/audio_frame_queue.c libavcodec/avpacket.c libavcodec/dv_profile.c libavcodec/dwt.c libavcodec/libtheoraenc.c libavcodec/rawdec.c libavcodec/rv40dsp.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/v210dec.h libavcodec/vc1dsp.c libavcodec/x86/Makefile libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/buffer.c libavfilter/formats.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_select.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/version.h libavutil/audioconvert.c libavutil/error.h libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Don't include common.h from avutil.hMartin Storsjö2012-08-151-0/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | jpeglsdec: fix infinite loopMichael Niedermayer2011-09-081-0/+2
|/ | | | | | Fixes Ticket331 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
* 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
* split jpeg_ls into jpeglsdec, jpeglsenc and jpeglsAurelien Jacobs2007-05-131-0/+111
Originally committed as revision 9021 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status