generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,767 Commits 24 Branches 241 Tags
Commit Graph

677 Commits

Author SHA1 Message Date
Michael Niedermayer
24a0273cb8 avutil/lzo: Fix integer overflow 
Embargoed-till: 2014-06-27 requested by researcher, but embargo broken by libav today (git and mailing list)

Fixes: LMS-2014-06-16-4
Found-by: "Don A. Bailey" <donb@securitymouse.com>
See: ccda51b14c0fcae2fad73a24872dce75a7964996
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6af26c55c1ea30f85a7d9edbc373f53be1743ee)

Conflicts:

	libavutil/lzo.c
(cherry picked from commit 7b5c706494a775b2b0d0e0a38448610802eef8f4)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 15:23:08 +02:00
Xi Wang
974c2ad87c lzo: fix overflow checking in copy_backptr() 
The check `src > dst' in the form `&c->out[-back] > c->out' invokes
pointer overflow, which is undefined behavior in C.

Remove the check.  Also replace `&c->out[-back] < c->out_start' with
a safe form `c->out - c->out_start < back' to avoid overflow.

CC: libav-stable@libav.org

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6)

Conflicts:

	libavutil/lzo.c
(cherry picked from commit ff712a262d317f5bd6fc9552cd837508e584a565)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-06-23 15:23:06 +02:00
Michael Niedermayer
36e4be0a0a mem: fix memalign hack av_realloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fc11927890f38445a950b453d24928525da0e61a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5ae87280e219e843c71201c580780e8e30083559)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 19:49:12 +01:00
Michael Niedermayer
10da0edddc Merge remote-tracking branch 'qatar/release/0.5' into release/0.5 
* qatar/release/0.5:
  update version
  Release notes and changelog for 0.5.5
  Fix ff_imdct_calc_sse() on gcc-4.6
  Make DECLARE_ALIGNED macros work with external array specifiers
  Fix MMX rgb24 to yuv conversion with gcc 4.6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-11-06 01:35:41 +01:00
Måns Rullgård
1330a8a1cb Make DECLARE_ALIGNED macros work with external array specifiers 
The macro implementation might need the name of the variable being
declared for compiler-specific syntax.  Moving array specifiers outside
the macro invocation allows this to work.

Originally committed as revision 21363 to svn://svn.ffmpeg.org/ffmpeg/trunk
(cherry picked from commit 8a24e98d506f0f44ec58e06291fa0fce703fb6a8)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-11-05 11:29:12 +01:00
Michael Niedermayer
24cd7c5df7 Fix apparently exploitable race condition. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-04-26 12:30:57 +02:00
Janne Grunau
11f6eebdd3 consolidate .gitignore patters into a single file 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2c3589bfda036c7827ded0bf38b16dfe7630bae1)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-10 14:02:23 +01:00
Janne Grunau
9109a58867 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 348b8218f7a59374355c966dbe3b851a7275f952)

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
 2011-02-10 14:01:36 +01:00
Reinhard Tartler
a9785f58c6 backport symbol versioning patch 
Originally committed as revision 21595 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5
 2010-02-01 16:00:09 +00:00
Gwenole Beauchesne
f06ce1ce89 Add VA API pixel formats. 
Patch by Gwenole Beauchesne.

Originally committed as revision 17634 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-27 08:12:41 +00:00
Michael Niedermayer
b9c353fff2 Compact repeated messages to "Last message repeated x times". 
Originally committed as revision 17531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 17:53:14 +00:00
Stefano Sabatini
04331dea2a Split avutil.h, move all the pixel format definitions to the new 
dedicated file pixfmt.h.

Originally committed as revision 17528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 14:27:50 +00:00
Michael Niedermayer
50ded3fdb6 Add note about big vs. little endian. 
Originally committed as revision 17525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 13:48:25 +00:00
Peter Ross
88c21a6f14 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE. 
Originally committed as revision 17510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 00:55:49 +00:00
Måns Rullgård
03bc0f3744 Avoid warnings from AV_GCC_VERSION_AT_LEAST with some non-gcc compilers 
Originally committed as revision 17508 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-22 00:13:23 +00:00
Patrik Kullman
a90de11dba Check return value of posix_memalign and explicitly set pointer to NULL if it 
fails, patch by Patrik Kullman, patrik yes nu.

Originally committed as revision 17495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 20:38:27 +00:00
Måns Rullgård
28499cc8d8 Correct, portable definition of INT_BIT 
Originally committed as revision 17480 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-21 16:03:30 +00:00
Diego Biurrun
22009729d7 Remove reference to renamed header file xvmc_render.h. 
Originally committed as revision 17171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 02:02:42 +00:00
Carl Eugen Hoyos
0dd8966638 Silence one icc warning: 
variable "..." is used before its value is set

Originally committed as revision 17127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 09:12:52 +00:00
Diego Biurrun
b7d3a8c13f Use AV_GCC_VERSION_AT_LEAST instead of complicated __GNUC__ version check. 
Originally committed as revision 17114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-10 01:24:06 +00:00
Michael Niedermayer
3b49f69077 av_flatten to make the similarly named attribute available. 
Originally committed as revision 17105 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 21:47:57 +00:00
Michael Niedermayer
51066987cf av_uninit() to suppress false uninitialized warnings from gcc without deoptimizing code. 
Originally committed as revision 17104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-09 21:47:05 +00:00
Stefano Sabatini
74afdc5535 Document the av_base64_encode/decode functions. 
See the thread:
"[PATCH] Improve documentation for libavutil/base64.h".

Originally committed as revision 17074 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 21:23:15 +00:00
Stefano Sabatini
ac76729c10 Cosmetics: "* out" -> "*out" for consistency with the other 
parameters.

Originally committed as revision 17072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 21:19:04 +00:00
Stefano Sabatini
5118bd441d Cosmetics: rename the "size" parameter of av_base64_encode() to "in_size". 
Originally committed as revision 17071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 21:16:36 +00:00
Stefano Sabatini
52ef50a080 Cosmetics: prefer out/in over buf/src for the parameter names of 
av_base64_encode(), for consistency/readability reasons.

Originally committed as revision 17069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 21:13:11 +00:00
Stefano Sabatini
61ccbc52ea Cosmetics: consistently prefer "size" over "len"/"length" for the 
variable names.

Originally committed as revision 17067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 21:08:42 +00:00
Stefano Sabatini
0d20c3fdad Make av_base64_encode() do not require the user to provide an 
overallocated buffer where to put the encoded string.

See the thread:
"[PATCH] Improve documentation for libavutil/base64.h".

Originally committed as revision 17065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-08 21:00:39 +00:00
Stefano Sabatini
21eff9ced7 Add a new test program for base64, based on that removed in r17024. 
See the thread:
"[PATCH] remove unused and broken test program in libavutil/base64.c".

Originally committed as revision 17025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 23:29:25 +00:00
Stefano Sabatini
33094be894 Remove broken test program. 
Originally committed as revision 17024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 23:24:17 +00:00
Michael Niedermayer
6337178b4f Ensure that the palette is set in data[1] for all 8bit formats. 
Also document it.

Originally committed as revision 17018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-06 12:59:50 +00:00
Reimar Döffinger
25a03ba358 100l, don't run tests twice, this was some forgotten debugging code. 
Originally committed as revision 16975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 18:04:52 +00:00
Reimar Döffinger
551a0c796e Fix a bug in 3DEC CBC decryption and add more extensive tests based on 
the official test vectors.

Originally committed as revision 16974 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 17:58:19 +00:00
Reimar Döffinger
61eb8cc420 Update DES test code to use the new public API. 
Originally committed as revision 16972 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 17:03:49 +00:00
Reimar Döffinger
bc17cc01ed Add support for 3DES to DES module 
Originally committed as revision 16971 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 16:45:42 +00:00
Reimar Döffinger
1a534c7f1e Add and use a public API for RC4 and DES, analogous to the AES API. 
Originally committed as revision 16970 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-03 14:20:55 +00:00
Diego Biurrun
0d08e27015 Add necessary header for LIBAVUTIL_VERSION_MAJOR, fixes the warning: 
libavutil/lzo.c:235:5: warning: "LIBAVUTIL_VERSION_MAJOR" is not defined

Originally committed as revision 16962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 23:13:18 +00:00
Reimar Döffinger
679f5c2542 Documentation for LZO error return value flags 
Originally committed as revision 16950 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 20:42:06 +00:00
Reimar Döffinger
a545f067f3 Move doxygen documentation from lzo.c to lzo.h 
Originally committed as revision 16949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 20:30:36 +00:00
Reimar Döffinger
0b178e5629 Add av_ prefix to LZO stuff and thus make it officially part of the public API. 
Keep lzo1x_decode until the next major version bump for binary compatibility.

Originally committed as revision 16946 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-02 20:16:00 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives. 
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-02-01 02:00:19 +00:00
Diego Biurrun
674bd4f691 cosmetics: Use 'num' instead of 'nom' as abbreviation for numerator. 
Originally committed as revision 16910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-01 00:20:45 +00:00
Diego Biurrun
9d52d54df3 Add required header mem.h, av_malloc and friends are used. 
Originally committed as revision 16863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 18:52:51 +00:00
Diego Biurrun
dbef3f46b9 cosmetics: Move all #includes together at the beginning of the file. 
Originally committed as revision 16862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-30 18:46:39 +00:00
Diego Biurrun
4d55404fca Rename string.c to avstring.c so that the name of header and C file match. 
Originally committed as revision 16853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-29 22:12:36 +00:00
Diego Biurrun
7d685b486b spelling/grammar/consistency review part III 
Originally committed as revision 16849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 23:16:49 +00:00
Diego Biurrun
bfe3676feb spelling/grammar/consistency review part II 
Originally committed as revision 16848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 23:03:17 +00:00
Reimar Döffinger
7b484a7a17 Add "const" to AES function arguments where possible without generating 
more warnings.

Originally committed as revision 16847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 17:48:26 +00:00
Diego Biurrun
b69201a82c Add common.h #include, necessary for av_const. 
Originally committed as revision 16844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 08:50:10 +00:00
Diego Biurrun
89c9ff504b spelling/grammar/consistency review part I 
Originally committed as revision 16840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-28 00:16:05 +00:00