Commit Graph

245 Commits

Author SHA1 Message Date
Michael Niedermayer
1b10524312 fix 2 warnings
Originally committed as revision 7498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:58:41 +00:00
Michael Niedermayer
034f5fbaf2 seems i didnt copy anything from aes128.c so this should be more correct ?
Originally committed as revision 7497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:51:23 +00:00
Michael Niedermayer
c2fd2b20e5 unneeded
Originally committed as revision 7496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:45:27 +00:00
Michael Niedermayer
a6e923c9db unused think
Originally committed as revision 7495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:41:57 +00:00
Michael Niedermayer
0c5d2819a5 merge encrypt and decrypt so the source is simpler and the compiler can choose with inlining if it wants speed or small size
Originally committed as revision 7494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:39:38 +00:00
Michael Niedermayer
28b5123546 indent
Originally committed as revision 7493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:24:34 +00:00
Michael Niedermayer
954bd264c1 remove duplicate round_key
one context is now either for encoding or decoding (makes more sense in reality too)

Originally committed as revision 7492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:24:06 +00:00
Michael Niedermayer
54b78b2495 make decode look more like encode
Originally committed as revision 7491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:02:59 +00:00
Michael Niedermayer
cc85897055 dont use encode tables for decoding
Originally committed as revision 7490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 19:01:17 +00:00
Michael Niedermayer
73374bf4d0 remove no longer corret comment
Originally committed as revision 7489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:58:45 +00:00
Michael Niedermayer
179dc91160 unused stuff removial
Originally committed as revision 7488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:51:09 +00:00
Michael Niedermayer
f12cf3d215 merge inv_sbox into inv_mix
Originally committed as revision 7487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:47:01 +00:00
Michael Niedermayer
0458e79074 merge sbox with mix on the encryption side
add one more test vector

yes this needs a cleanup ...

Originally committed as revision 7485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 18:17:45 +00:00
Michael Niedermayer
2592438dd8 1 test vector
Originally committed as revision 7483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 17:43:45 +00:00
Michael Niedermayer
95d1236bf5 fix CONFIG_SMALL case
Originally committed as revision 7482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 17:19:04 +00:00
Michael Niedermayer
388b5e69ec simplify special round
Originally committed as revision 7481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:49:35 +00:00
Michael Niedermayer
cf5773e95f benchmark
Originally committed as revision 7480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:45:34 +00:00
Michael Niedermayer
ff8f659429 init multbl
code can now decrypt its own encryption correctly
can anyone provide me with a correct test AES key + cyphertext + plaintext?

Originally committed as revision 7479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:43:32 +00:00
Michael Niedermayer
b58ecac647 ascii
Originally committed as revision 7478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 16:19:51 +00:00
Reimar Döffinger
28221dd0fb 128bit-only AES implementation under development.
Originally committed as revision 7474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 14:08:02 +00:00
Michael Niedermayer
b1e5c29485 cosmetic
Originally committed as revision 7472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:47:15 +00:00
Michael Niedermayer
ba554c025e simplify round_key generation by writing over the end but ensuring that theres some irrelevant stuff afterwards
Originally committed as revision 7471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:46:20 +00:00
Michael Niedermayer
84c72fb129 cosmetics
Originally committed as revision 7470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:38:10 +00:00
Michael Niedermayer
7acc1a27bc memcpy
Originally committed as revision 7469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:37:19 +00:00
Michael Niedermayer
1070eba2a2 seems the larger rcon values are never accessed
Originally committed as revision 7468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:30:37 +00:00
Michael Niedermayer
12d6a1c813 copyright fix
Originally committed as revision 7467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:16:29 +00:00
Michael Niedermayer
cd0968c4ca stealing multbl trick from reimar
Originally committed as revision 7466 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 13:15:26 +00:00
Michael Niedermayer
e8fc93136d stealing reimars XOR_BLOCK
Originally committed as revision 7464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 12:40:32 +00:00
Michael Niedermayer
d43a297579 cosmetic
Originally committed as revision 7463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:27:11 +00:00
Michael Niedermayer
eade86e2f5 memleak
Originally committed as revision 7462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:25:52 +00:00
Michael Niedermayer
2c3427eb2a simplify sbox init
Originally committed as revision 7461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:14:05 +00:00
Michael Niedermayer
3306dfd544 aes support (unfinished)
Originally committed as revision 7460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-14 09:06:13 +00:00
Axel Holzinger
411983c1f2 Allow to uninstall a custom log callback
patch by Axel Holzinger % aholzinger A gmx P de %
original thread:
date: Jan 11, 2007 4:54 PM
subject: [Ffmpeg-devel] [PATCH] uninstall custom log callback

Originally committed as revision 7446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 17:10:34 +00:00
Christophe Mutricy
d0b456ba1e Avoid "HAVE_CMOV not defined" warning.
patch by Christophe Mutricy, xtophe nxtelevision com

Originally committed as revision 7443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-13 04:01:35 +00:00
Michael Niedermayer
6880edab82 fix av_reduce() with things like 1/0 and 0/0
Originally committed as revision 7431 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-09 11:58:06 +00:00
Luca Abeni
40628be0ed __attribute__((unused)) works with gcc 2.95 too
Originally committed as revision 7421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 11:11:49 +00:00
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 00:35:08 +00:00
Måns Rullgård
1845bf1fdf merge #ifdef HAVE_AV_CONFIG_H sections
Originally committed as revision 7254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 20:06:11 +00:00
Måns Rullgård
a77caa4dc9 fix mingw shared build, and get rid of FF_IMPORT_ATTR
Originally committed as revision 7253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-07 19:27:00 +00:00
Måns Rullgård
8da9266cea use the standard INT64_C() macro for 64-bit constants
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Måns Rullgård
cd10789691 move more macros to internal.h
Originally committed as revision 7239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:23:20 +00:00
Måns Rullgård
5403f8576b move some __attribute__ macros to internal.h
Originally committed as revision 7238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 21:27:08 +00:00
Måns Rullgård
c48e633b9e remove 'restrict' definition, it is always #defined in config.h
Originally committed as revision 7237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 20:31:39 +00:00
Reimar Döffinger
cf1e119bb2 Move BE_*/LE_*/ST*/LD* macros to a common place. Some further
optimization/cleanup would be desirable (e.g. LE_* and LD*
should be the same on x86).

Originally committed as revision 7218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-03 16:35:30 +00:00
Diego Biurrun
c6c367254f spelling cosmetics: cliped --> clipped
Originally committed as revision 7208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 14:19:49 +00:00
Michael Niedermayer
fc0b041637 doxy
Originally committed as revision 7188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 12:00:29 +00:00
Michael Niedermayer
62b9fc1571 fix overflow and remove wrong comment
Originally committed as revision 7187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 11:43:08 +00:00
Michael Niedermayer
3db1b8b538 return optimal fraction
based on a patch by Uoti Urpala

Originally committed as revision 7186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-30 01:18:57 +00:00
Reimar Döffinger
40a08c7e9a Correct GET/PUT_UTF8 comment: the get/put functions might be called up
to 7 times, though only up to 4 times for valid utf-8 values.

Originally committed as revision 7124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-19 09:43:26 +00:00
Reimar Döffinger
a99cfb0d0e Fix typo in comment
Originally committed as revision 7123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-19 09:33:50 +00:00
Alex Beregszaszi
20d46c038a Remove alpha channel from RGB555
Originally committed as revision 7106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 20:46:36 +00:00
Baptiste Coudurier
3666f75d33 make option field const
Originally committed as revision 7093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-16 00:29:15 +00:00
Måns Rullgård
7e5f82dc06 move comment
Originally committed as revision 7072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 21:57:27 +00:00
Måns Rullgård
576a85f7c9 remove workaround for missing inttypes.h
Originally committed as revision 7068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 20:00:55 +00:00
Michael Niedermayer
eaaa48b29e 0.5l
Originally committed as revision 7052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 10:04:09 +00:00
Måns Rullgård
81dc56e76e clean up inttypes.h and int_fastxx_t types detection
Originally committed as revision 7050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 04:02:58 +00:00
Måns Rullgård
f940f7c9d2 merge CONFIG_WINCE sections
Originally committed as revision 7047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 03:37:44 +00:00
Måns Rullgård
635eb0cc3d indentation
Originally committed as revision 7046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 03:35:50 +00:00
Michael Niedermayer
3320687691 improve enumerate so arbitrary ranges can be enumerated quickly
Originally committed as revision 7033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 01:06:15 +00:00
Michael Niedermayer
9eb88fdeba AVL tree
Originally committed as revision 7031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 01:02:30 +00:00
Måns Rullgård
9ddbcae667 rename MEMALIGN_HACK to CONFIG_MEMALIGN_HACK, use common code in configure
Originally committed as revision 7025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 00:35:21 +00:00
Måns Rullgård
36cd306907 rename inverse -> ff_inverse
Originally committed as revision 6990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-12 18:49:36 +00:00
Måns Rullgård
997baf0141 allow spaces in source and build directory names
out of tree builds from a source dir with spaces is impossible
due to how make handles vpath

Originally committed as revision 6938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 00:02:15 +00:00
Guillaume Poirier
d73427e347 Add doxy comments for macro GET_UTF8
another fix in PUT_UTF8 doxy description

Originally committed as revision 6917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-06 12:38:00 +00:00
Guillaume Poirier
34d3376902 Fix wrong params name in PUT_UTF8 doxy comments
Originally committed as revision 6913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-06 10:39:07 +00:00
Guillaume Poirier
0e8c148b59 woops, fix missplaced doxy comment
Originally committed as revision 6912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-06 10:35:54 +00:00
Zuxy Meng
360932f76d Fix ASF format parser's broken UTF-16 string handling
1. Add a PUT_UTF8 macro to common.h; code borrowed from libavcodec/flacenc.c.
2. Make use of the macro in flacenc.c
Patch by Zuxy Meng % zuxy P meng A gmail P com %
Original thread:
Date: Nov 5, 2006 9:56 AM
Subject: [Ffmpeg-devel] PUT_UTF8 & asf format enhancement

Originally committed as revision 6911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-06 10:32:48 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts.
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:39:58 +00:00
Steve L'Homme
523fc7c17d Define fallback for PRIX64, taken from a patch by Steve L'Homme.
Originally committed as revision 6867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 22:37:56 +00:00
Diego Biurrun
1345f4ed6c Rename SWAP macro to FFSWAP.
Originally committed as revision 6865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 21:28:36 +00:00
Diego Biurrun
3cd52279c9 Use common define for x86_32 and x86_64.
Originally committed as revision 6859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 18:34:40 +00:00
Diego Biurrun
419b878494 Add ARCH_X86_32 as a new define for 32 bit x86 architectures and change
the semantics of ARCH_X86 to mean both 32 and 64 bits.

Originally committed as revision 6852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 17:01:33 +00:00
Diego Biurrun
6c02f9e7ee better #endif comment
Originally committed as revision 6851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 16:59:18 +00:00
Kostya Shishkov
34380af0e1 16-bit grayscale support
Originally committed as revision 6778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-24 04:57:43 +00:00
Guillaume Poirier
94e4c3a333 Protect code that uses CMOV instructions with HAVE_CMOV,
Make configure set CMOV_IS_FAST on arches on which cmov has a low latency
(typically non-Netburst based processor)

Originally committed as revision 6749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-20 17:53:19 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS.
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 23:17:58 +00:00
Diego Biurrun
02305ff38f Rename SIGN macro to FFSIGN to avoid clashes with system headers.
Originally committed as revision 6665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 22:59:37 +00:00
Diego Biurrun
dadb850a50 Move CFLAGS handling to common.mak.
Originally committed as revision 6642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 08:30:13 +00:00
Diego Biurrun
a22b7322cc Move sign macro to libavutil.
Originally committed as revision 6620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-10 07:49:10 +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
Diego Biurrun
cbeee4d8e5 Replace -I../-I. by -I$(BUILD_ROOT).
Originally committed as revision 6572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 09:22:44 +00:00
Siarhei Siamashka
eeebe6ad1f add FASTDIV macro for ARM. Reported speed-up on MPEG-4 decoding: 1.8%
Patch by Siarhei Siamashka %siarhei P siamashka A gmail P com%
Original thread:
Date: Sep 28, 2006 2:26 AM
Subject: [Ffmpeg-devel] [PATCH] ARM implementation of FASTDIV

Originally committed as revision 6366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-28 08:04:16 +00:00
Luca Barbato
79e47000c8 move memory functions from avcodec to avutil
Originally committed as revision 6330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-25 15:23:40 +00:00
Loren Merritt
8e06f20abf remove a division from STOP_TIMER
Originally committed as revision 6315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-21 18:00:05 +00:00
Loren Merritt
7e611a0e8c simplify asm mid_pred, as suggested by michaelni.
Originally committed as revision 6314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-21 17:48:45 +00:00
Roman Shaposhnik
f5a478f65d * Moving FifoBuffer out of libavformat/avformat.h and
libavformat/utils.c into libavutil

Originally committed as revision 6310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-21 07:31:53 +00:00
Loren Merritt
93a319f13b asm implementation of mid_pred.
20% faster huffyuv decoding, 4% faster ffv1.

Originally committed as revision 6254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-15 00:36:49 +00:00
Diego Biurrun
04d7f60143 Add official LGPL license headers to the files that were missing them.
Originally committed as revision 6219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 14:02:42 +00:00
Panagiotis Issaris
af0ad8f0c1 Remove unused defines, patch by takis P issaris A uhasselt P be
Original thread:
Re: [Ffmpeg-devel] [PATCH] Remove unused internal macros
Sep 7 2006, 14:05

Originally committed as revision 6188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-07 13:42:36 +00:00
Diego Biurrun
af41dd8216 Exchange informal LGPL notice by official license header.
Originally committed as revision 6164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-04 09:31:30 +00:00
Diego Biurrun
7494517673 Add license from zlib.h instead of referring to it.
Originally committed as revision 6155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-03 14:13:32 +00:00
Luca Barbato
9814587500 Align the input buffer in ffplay, introduce a public macro for aligned declarations
Update the avcodec_decode_audio and the float_to_int16 descriptions accordingly

Originally committed as revision 6147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-31 19:14:00 +00:00
Luca Abeni
001299bfe8 Add some new pixel formats to libavutil
Originally committed as revision 6112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-28 09:06:04 +00:00
Michael Niedermayer
27cd2c10b0 compatibility warning
Originally committed as revision 6035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-20 18:10:45 +00:00
Michael Niedermayer
0cb5cfb615 cleanup PixelFormat a little
Originally committed as revision 6034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-20 13:04:19 +00:00
Michael Niedermayer
955ab9a4d8 attribute_deprecated
Originally committed as revision 6033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-20 10:42:11 +00:00
Michael Niedermayer
67eca72dc0 SWAP
Originally committed as revision 6030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-19 20:55:02 +00:00
Diego Biurrun
f4bd289a04 Explicitly include fastmemcpy.h from libvo/.
Originally committed as revision 6021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-18 13:38:24 +00:00
Diego Biurrun
7981555d89 Move all internal -I parameters to the front of CFLAGS to avoid using external
header files that happen to have the same name as internal ones.

Originally committed as revision 6016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 16:32:08 +00:00
Michael Niedermayer
0a7c36af54 revert aligned realloc() changesm this should be identical to r5784
Originally committed as revision 6008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-17 08:18:48 +00:00