1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-07-21 19:54:13 +02:00
Commit Graph

34 Commits

Author SHA1 Message Date
Michael Niedermayer
a00d4c5956 Merge commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186'
* commit 'c598b569fb3d1f4b6c4868fe64f6989254df5186':
  png: K&R formatting cosmetics

Conflicts:
	libavcodec/png.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 15:29:42 +01:00
Vittorio Giovara
c598b569fb png: K&R formatting cosmetics 2014-03-16 23:29:50 +01:00
Michael Niedermayer
0d0f76ea56 Merge commit '6327c10702922eabcb1c6170abd3f03d23ce4c51'
* commit '6327c10702922eabcb1c6170abd3f03d23ce4c51':
  atomic: fix CAS with armcc.
  png: use av_mallocz_array() for the zlib zalloc function
  libmp3lame: use the correct remaining buffer size when flushing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-12 21:39:38 +01:00
Justin Ruggles
486f0b0cfc png: use av_mallocz_array() for the zlib zalloc function
Fixes valgrind uninitialized memory errors when decoding png.

CC:libav-stable@libav.org
2013-03-08 14:52:21 -05:00
Paul B Mahol
a09ae4ef65 Remove duplicated png and mng signatures.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-06-15 00:53:34 +00:00
Clément Bœsch
50a3867bab png: make ff_png_pass_mask local to pngdec. 2012-03-22 22:53:51 +01:00
Michael Niedermayer
fd8a8373aa pngdec: Fix masks for interlaced decoding
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-22 00:46:19 +01:00
Paul B Mahol
aff9cb8377 lavc: remove unused headers
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-17 20:55:19 +01:00
Diego Elio Pettenò
ff0d737d6e Make ff_png_pass_xmin and ff_png_pass_xshift static to png.c.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit f2e246f576)
2011-01-26 03:43:32 +01:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Loren Merritt
042e0adda9 decode mng color decorrelation
Originally committed as revision 12228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 10:21:33 +00:00
Måns Rullgård
e0eddd1269 hardly anything in PNGContext is shared; split it
Originally committed as revision 9689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-15 19:23:55 +00:00
Måns Rullgård
b958a7f111 separate en/decoder specific parts from png.c
Originally committed as revision 9686 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-15 18:24:26 +00:00
Diego Biurrun
ac3967c1ce spelling
Originally committed as revision 9221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 23:07:27 +00:00
Ramiro Polla
2c124cb65c Use AV_xx throughout libavcodec
Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 01:41:07 +00:00
Ramiro Polla
67a5daf07f Remove duplicate bytestream functions
Originally committed as revision 9108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-23 14:55:13 +00:00
Diego Biurrun
3cf5b6bed7 consistency renaming: rgba32 --> rgb32
Originally committed as revision 7957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-12 23:07:17 +00:00
Diego Biurrun
71e445fca3 Replace deprecated PIX_FMT names by the newer variants.
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-07 01:48:09 +00:00
Måns Rullgård
e3d2a690e8 remove useless #ifdef CONFIG_ZLIB
Originally committed as revision 7623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:55:10 +00:00
Kostya Shishkov
ae912c5b62 PNG 16-bit gray decoding support
Originally committed as revision 6779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-24 04:59:46 +00:00
Kostya Shishkov
ab9ce19170 Make PNG produce correct 8-bit pictures
Originally committed as revision 6689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-14 12:23:54 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Måns Rullgård
62bb489b13 add some #ifdef CONFIG_ENCODERS/DECODERS
Originally committed as revision 6356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-27 19:54:07 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18 11:33:14 +00:00
Steve L'Homme
267f7edcd1 (f)printf --> av_log conversion
taken from a patch by Steve L'Homme

Originally committed as revision 5127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-08 11:43:10 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Roine Gustafsson
983ea0bc87 a few #ifdef CONFIG_X_ENCODER, patch by (Roine Gustafsson <roine users.sourceforge net]
Originally committed as revision 4213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-10 20:39:11 +00:00
Michael Niedermayer
934982c4ac avoid buf_size == 0 checks in every decoder
Originally committed as revision 3872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-23 18:09:06 +00:00
Michael Niedermayer
0ecca7a49f various security fixes and precautionary checks
Originally committed as revision 3822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 00:16:25 +00:00
Milan Cutka
e20815b396 When bswap_32 is a macro, png images fail to decode properly, patch by (Milan Cutka <cutka>at<szm>dot<sk>)
Originally committed as revision 3672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-12 09:48:06 +00:00
Michael Niedermayer
4eff7cf42d porting png support from -f image to -f image2
Originally committed as revision 3665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-09 23:31:46 +00:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Diego Elio Pettenò
f2e246f576 Make ff_png_pass_xmin and ff_png_pass_xshift static to png.c.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00