generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,121 Commits 24 Branches 241 Tags 173 MiB
b442ca69d9
Commit Graph

73 Commits

Author SHA1 Message Date
Michael Niedermayer
721be99371 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: fix some then/than typos
  doxygen: Include libavcodec and libavformat examples into the documentation
  avutil: elaborate documentation for av_get_random_seed
  Add support for aac streams in mp4/mov without extradata.
  aes: whitespace cosmetics
  adler32: whitespace cosmetics
  swscale: fix another yuv range conversion overflow in 16bit scaling.
  Fix cpu flags test program
  opt-test: Add missing braces to silence compiler warnings.
  build: Eliminate obsolete test targets.
  udp: Fix a compilation warning
  swscale: Unbreak build with --enable-small
  base64: add fate test
  aes: improve test program and add fate test
  adler32: make test program more useful and add fate test
  swscale: fix yuv range correction when using 16-bit scaling.
  aacenc: Make chan_map const correct

Conflicts:
	Makefile
	doc/examples/muxing-example.c
	libavformat/udp.c
	libavutil/random_seed.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-01 05:35:26 +02:00
Mans Rullgard
4bfe064460 aes: whitespace cosmetics 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-30 16:50:27 +01:00
Mans Rullgard
744765a9c5 aes: improve test program and add fate test 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-06-30 09:47:32 +01: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
Måns Rullgård
c184bb44db aes: fix array index out of bounds warning 
Originally committed as revision 24048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-04 20:38:46 +00:00
Reimar Döffinger
19c039ee3d Make mix function more readable. 
Compiler output unchanged with gcc 4.4.

Originally committed as revision 24006 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-07-02 17:33:45 +00:00
Reimar Döffinger
dd025f25da Change AES code to be strict-aliasing-safe. 
Makes it give correct results with e.g. gcc 4.4.
For unknown reasons the generate asm code also changes
on e.g. gcc 4.3, making the code a bit larger but also
a bit faster.

Originally committed as revision 23896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-30 04:50:35 +00:00
Reimar Döffinger
2ad4a3bc78 Pass subshift an argument of the proper type. 
No changes in generated code.

Originally committed as revision 23856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 17:19:55 +00:00
Reimar Döffinger
17c78b087a Use a consistent type for multbl array function parameters. 
Originally committed as revision 23855 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-06-28 17:11:48 +00:00
Diego Biurrun
64bde1974b cosmetics: Rename prn variable to prng (Pseudo Random Number Generator). 
Originally committed as revision 18422 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-10 17:23:38 +00:00
Diego Biurrun
294eaa2643 Replace random() usage in test programs by av_lfg_*(). 
Originally committed as revision 18070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 11:48:27 +00:00
Diego Biurrun
b56e34c5e9 Make AES test program compile again: Setting the av_log_level variable 
needs to be replaced by a call to av_log_set_level().

Originally committed as revision 18055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-20 00:18:46 +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
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Diego Biurrun
43bfaa8920 Fix test program compilation, random() needs to be undefined. 
Originally committed as revision 11470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-08 22:40:25 +00:00
Diego Biurrun
f8a80fd69d main() --> main(void) 
Originally committed as revision 11079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-23 00:52:56 +00:00
Reimar Döffinger
ef0d7a0d4f Document aes init code writing on purpose beyond round_key array into state array. 
Originally committed as revision 9734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-18 12:22:07 +00:00
Diego Biurrun
2eb697a455 Move comment to a slightly better place. 
Originally committed as revision 9462 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-02 17:00:51 +00:00
Michael Niedermayer
79d4c96a1a correct last element inited check 
Originally committed as revision 9018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-13 19:14:18 +00:00
Baptiste Coudurier
57d7b036ea make key parameter const 
Originally committed as revision 7935 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-11 16:57:17 +00:00
Michael Niedermayer
ca2560dff6 10l (aes_crypt -> av_aes_crypt) 
Originally committed as revision 7559 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-17 00:49:48 +00:00
Michael Niedermayer
97f6d1545e fix CONFIG_SMALL again 
Originally committed as revision 7554 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 19:50:49 +00:00
Michael Niedermayer
5d1b539348 30byte smaller object file 
Originally committed as revision 7553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 19:30:43 +00:00
Michael Niedermayer
97e3458c46 cbc support 
Originally committed as revision 7550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 19:08:52 +00:00
Michael Niedermayer
2d3475ae6a avoid memcpy() 
Originally committed as revision 7549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 17:58:11 +00:00
Michael Niedermayer
7465619af8 give crypt a src and dst 
same speed, 100bytes larger object file

Originally committed as revision 7548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 17:51:54 +00:00
Michael Niedermayer
b0642c7409 change subshift a little, this reduces the object size a litlle 
Originally committed as revision 7546 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 17:40:40 +00:00
Michael Niedermayer
298dd6b7c8 use 2 state arrays so that fewer temporary variables are needed 
Originally committed as revision 7545 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 17:17:05 +00:00
Michael Niedermayer
cc6b4da83a remove useless parameter 
Originally committed as revision 7544 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 16:29:01 +00:00
Michael Niedermayer
14bc38498a unused variable 
Originally committed as revision 7543 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-16 16:24:43 +00:00
Michael Niedermayer
1aa72a703c merge shift into mix 
this need -fno-strict-aliasing to work (needs to be fixed of course)

Originally committed as revision 7534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 13:45:48 +00:00
Michael Niedermayer
1f83576b48 make aes_en/decrypt() static until we decided on the public API 
Originally committed as revision 7533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 10:37:34 +00:00
Michael Niedermayer
0d80bd2f56 move #include log.h into the selftesting code where it belongs 
Originally committed as revision 7529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 01:33:56 +00:00
Michael Niedermayer
6572e1a4d2 remove dependancy on *malloc() 
Originally committed as revision 7528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 01:32:06 +00:00
Michael Niedermayer
347c27988d check the last? entry written for detecting already initalized tables 
Originally committed as revision 7527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 01:05:40 +00:00
Michael Niedermayer
96b103086e replace / by >> this makes the .o ~150 bytes smaller 
Originally committed as revision 7525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 01:01:56 +00:00
Michael Niedermayer
e42244e9df cosmetic 
Originally committed as revision 7524 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-15 00:55:51 +00:00
Michael Niedermayer
597e3232ef simplify 
Originally committed as revision 7504 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-14 21:40:21 +00:00
Michael Niedermayer
7200f5d054 simplify multiply table init 
Originally committed as revision 7503 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-14 21:30:54 +00:00
Michael Niedermayer
d65dc0cdc6 simplify selftest 
Originally committed as revision 7501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-14 21:20:15 +00:00
Michael Niedermayer
f25b650a5b revert simplification (broke 192 bit keys) 
Originally committed as revision 7500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-14 21:13:14 +00:00
Michael Niedermayer
8d4ae47c3f simplify 
Originally committed as revision 7499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-14 21:03:15 +00:00
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