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
AgeCommit message (Collapse)Author
2016-06-21Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
2016-05-04cosmetics: Fix spelling mistakesVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2015-03-31Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'Michael Niedermayer
* commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5': mjpeg: Use a more precise type for put_marker() Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-30Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80'Michael Niedermayer
* 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>
2015-03-30mjpeg: Use a more precise type for put_marker()Diego Biurrun
2015-03-30mjpeg: Move code only used in the encoder(s) to the appropriate headerDiego Biurrun
2014-11-11mjpegenc: fix argument size in encode_mbVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 1047235
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-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-12avcodec/mjpegenc: pass chroma quantization matrix through as well, not just lumaMichael 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: 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-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-01-23Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'Michael Niedermayer
* 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>
2013-01-23Drop DCTELEM typedefDiego Biurrun
It does not help as an abstraction and adds dsputil dependencies. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2012-06-14mjpegenc: support slice multithreadingMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2010-04-20Remove explicit filename from Doxygen @file commands.Diego Biurrun
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
2009-02-01Use full internal pathname in doxygen @file directives.Diego Biurrun
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
2009-01-19cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31Globally rename the header inclusion guard names.Stefano Sabatini
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
2007-10-17Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun
Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05Group all copyright and author notices together.Diego Biurrun
Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19add a proper prefix to all mjpeg encoder exported functionsAurelien Jacobs
Originally committed as revision 9058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19split ljpeg encoder out of mjpeg.cAurelien Jacobs
Originally committed as revision 9057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>