Commit Graph

81 Commits

Author SHA1 Message Date
Michael Niedermayer
6d91045d83 Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  doc: update libavfilter documentation
  tls: Use the URLContext as logging context
  aes: Avoid illegal read and don't generate more key than we use.
  mpc7: Fix memset call in mpc7_decode_frame function
  atrac1: use correct context for av_log()
  apedec: consume the whole packet when copying to the decoder buffer.
  apedec: do not needlessly copy s->samples to nblocks.
  apedec: check output buffer size after calculating actual output size
  apedec: remove unneeded entropy decoder normalization.
  truespeech: use memmove() in truespeech_update_filters()
  vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
  vorbisdec: remove unneeded buf_size==0 check
  vorbisdec: return proper error codes instead of made-up ones
  http: Don't add a Range: bytes=0- header for POST
  sunrast: Check for invalid/corrupted bitstream
  http: Change the chunksize AVOption into chunked_post
  http: Add encoding/decoding flags to the AVOptions
  avconv: remove some codec-specific hacks
  crypto: add decoding flag to options.
  tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
  ...

Conflicts:
	doc/libavfilter.texi
	libavcodec/atrac1.c
	libavcodec/sunrast.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-11 02:50:35 +01:00
Alex Converse
c9e5ac3380 aes: Avoid illegal read and don't generate more key than we use. 2011-11-10 10:15:59 -08:00
Michael Niedermayer
5d4fd1d1ad Merge remote-tracking branch 'qatar/master'
* qatar/master: (36 commits)
  ARM: allow unaligned buffer in fixed-point NEON FFT4
  fate: test more FFT etc sizes
  dca: set AVCodecContext frame_size for DTS audio
  YASM: Shut up unused variable compiler warning with --disable-yasm.
  x86_32: Fix build on x86_32 with --disable-yasm.
  iirfilter: add fate test
  doxygen: Add qmul docs.
  ogg: propagate return values and return more meaningful error values
  H.264: fix overreads of qscale_table
  Remove unused static tables and static inline functions.
  eval: clear Parser instances before using
  dct-test: remove 'ref' function pointer from tables
  build: Remove deleted 'check' target from .PHONY list.
  oggdec: Abort Ogg header parsing when encountering a data packet.
  Add LGPL license boilerplate to files lacking it.
  mxfenc: small typo fix
  doxygen: Fix documentation for some VP8 functions.
  sha: use AV_RB32() instead of assuming buffer can be cast to uint32_t*
  des: allow unaligned input and output buffers
  aes: allow unaligned input and output buffers
  ...

Conflicts:
	libavcodec/dct-test.c
	libavcodec/libvpxenc.c
	libavcodec/x86/dsputil_mmx.c
	libavcodec/x86/h264_qpel_mmx.c
	libavfilter/x86/gradfun.c
	libavformat/oggdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-05 02:26:17 +02:00
Mans Rullgard
d04d9f24a0 aes: allow unaligned input and output buffers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-04 11:07:15 +01:00
Michael Niedermayer
976a8b2179 Merge remote-tracking branch 'qatar/master'
* qatar/master: (40 commits)
  H.264: template left MB handling
  H.264: faster fill_decode_caches
  H.264: faster write_back_*
  H.264: faster fill_filter_caches
  H.264: make filter_mb_fast support the case of unavailable top mb
  Do not include log.h in avutil.h
  Do not include pixfmt.h in avutil.h
  Do not include rational.h in avutil.h
  Do not include mathematics.h in avutil.h
  Do not include intfloat_readwrite.h in avutil.h
  Remove return statements following infinite loops without break
  RTSP: Doxygen comment cleanup
  doxygen: Escape '\' in Doxygen documentation.
  md5: cosmetics
  md5: use AV_WL32 to write result
  md5: add fate test
  md5: include correct headers
  md5: fix test program
  doxygen: Drop array size declarations from Doxygen parameter names.
  doxygen: Fix parameter names to match the function prototypes.
  ...

Conflicts:
	libavcodec/x86/dsputil_mmx.c
	libavformat/flvenc.c
	libavformat/oggenc.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-04 00:45:21 +02:00
Mans Rullgard
8f175810be aes: fix for big endian systems
This was missed in 5d20f19 since CONFIG_SMALL was always broken
for big endian.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 13:41:42 +01:00
Mans Rullgard
5d20f19be2 aes: fix invalid array indexing in init code
This makes the code work with clang/x86_32 and removes several warnings.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 03:09:22 +01:00
Mans Rullgard
af2ea72495 aes: use direct assignments instead of memcpy() or loops
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-07-03 03:08:52 +01:00
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