Commit Graph

20315 Commits

Author SHA1 Message Date
Måns Rullgård
caf458dda4 Allow filtering of flags passed to compiler and assembler
This can be used to map gcc-type flags to equivalents with other
compilers.

Originally committed as revision 19421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 22:44:05 +00:00
Diego Biurrun
647c2356a6 Make (de)muxers for format variants select the main format (de)muxer.
It makes little sense to enable the variant without the main format.

Originally committed as revision 19420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 22:31:05 +00:00
Måns Rullgård
d8059267bc Place flags for dependency generation in DEPFLAGS
This avoids duplicating the full DEPEND_CMD line only to change some
flags.

Originally committed as revision 19419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 22:28:24 +00:00
Måns Rullgård
ce40e3470c Set CPPFLAGS in config.mak using normal assignment
Setting this value using ?= caused some trouble if it was already
defined in the environment.

Originally committed as revision 19418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 21:14:00 +00:00
Måns Rullgård
8c6d2da5be Protect config.mak against multiple inclusion
Some of the values set here are modified by the main makefiles
and should not be reset when config.mak is included again.

Originally committed as revision 19417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 21:13:57 +00:00
Stefano Sabatini
04a803bef4 Append the user CPPFLAGS value to the CPPFLAGS used for compilation,
rather than prepend it.

This way there is the guarantee that the included headers are those in
the FFmpeg sources, rather than pre-installed headers referenced by
the user CPPFLAGS.

Originally committed as revision 19416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 15:50:25 +00:00
Måns Rullgård
0115927eae Use CFLAGS in default DEPEND_CMD
Originally committed as revision 19415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 14:13:34 +00:00
Måns Rullgård
9e7f32775c Use CFLAGS in check_cpp
Originally committed as revision 19414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 14:13:32 +00:00
Måns Rullgård
75bafbac7b Set as_default after compiler detection, allowing compiler-specific defaults
Originally committed as revision 19413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:55 +00:00
Måns Rullgård
2f2e6c7ce1 Pass ASFLAGS to assembler instead of CFLAGS
Originally committed as revision 19412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:53 +00:00
Måns Rullgård
7f32f40c89 Add flags from --extra-cflags after compiler detection
Originally committed as revision 19411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:51 +00:00
Måns Rullgård
997f3ba4ef Set CPU selection flags in $cpuflags, add to cflags outside case block
Originally committed as revision 19410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:48 +00:00
Måns Rullgård
7e6c86e65d Allow unusual ways of specifying compiler output file
Some compilers do not use the typical -c -o foo.o style.
This allows compiler-specific equivalents to be set by the
configure script.

Originally committed as revision 19409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:46 +00:00
Måns Rullgård
50567afa5a Use DEPCC to find dependencies, default to same as CC
Originally committed as revision 19408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:43 +00:00
Måns Rullgård
684b28e09c Use LD for linking, default to same as CC
Originally committed as revision 19407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:40 +00:00
Måns Rullgård
3198f6187a Set CFLAGS directly in config.mak instead of using OPTFLAGS
Originally committed as revision 19406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:38 +00:00
Måns Rullgård
467256f248 Add --sysroot flag to CPPFLAGS, not CFLAGS
Originally committed as revision 19405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:35 +00:00
Måns Rullgård
50a334e426 Separate C preprocessor flags into CPPFLAGS variable
Originally committed as revision 19404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:29:32 +00:00
Diego Biurrun
95a61cfc24 Make VAAPI/VDPAU variant of decoder foo depend on decoder foo.
The VAAPI/VDPAU variants of foo require almost all of the code of foo.
Thus it makes little sense to enable just the accelerated variant.
This allows refactoring some object dependencies in the Makefiles.

Originally committed as revision 19403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 13:22:01 +00:00
Stefano Sabatini
68485d2728 Remove useless definition of struct AVCLASS.
Originally committed as revision 19402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 11:30:42 +00:00
Måns Rullgård
fed5d54b56 configure: allow bulk-disabled things to be re-enabled by dependents
Originally committed as revision 19401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-12 00:17:42 +00:00
Alex Converse
36f517736f Cosmetics: reindent after last commit
Originally committed as revision 19400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 21:54:06 +00:00
Alex Converse
6308765cb5 Ignore subsequent channel configurations after the first in an AAC file. The
current code doesn't handle them properly, and they are a dubious construction
at best.

Originally committed as revision 19399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 21:53:04 +00:00
Alex Converse
c8ec2f1cb8 Mark iir filter init and free functions av_cold.
Originally committed as revision 19398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 20:55:15 +00:00
Alex Converse
47f49f98ca Fix "iirfilter.c:55: warning: unused variable ‘size’"
Originally committed as revision 19397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 20:51:22 +00:00
Alex Converse
e187d87d7d Eliminate use of complex.h from iirfilter.c
Originally committed as revision 19396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 20:45:13 +00:00
Alex Converse
291fd18a6e Add a log2 replacement for systems that haven't quite caught up with the C99
standard library.

Originally committed as revision 19395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 19:20:06 +00:00
Kostya Shishkov
451ae25724 Prepare SHA code to handle SHA-2 as well. For now rename files and functions
and leave av_sha1_* functions for compatibility until next major bump.

Originally committed as revision 19394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 15:50:49 +00:00
Ramiro Polla
71ecc16b09 cygwin documentation: diffutils is part of the Utils packages.
Originally committed as revision 19393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-10 00:16:20 +00:00
Alex Converse
6892931b0b Add myself as AAC encoder maintainer
Originally committed as revision 19392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 17:35:56 +00:00
Alex Converse
988c170547 Change fminf/fmaxf to FFMIN/FFMAX to fix the build on broken operating systems.
Originally committed as revision 19391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 17:22:59 +00:00
Måns Rullgård
181b336304 Fix declarations of complex numbers
Complex numbers must be declared using a base type of float, double,
or long double.

Originally committed as revision 19390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 10:16:00 +00:00
Kostya Shishkov
0d73abb86a Rename function to sha1_transform so it won't be confused with SHA-2 transform
when it's added.

Originally committed as revision 19389 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 07:29:03 +00:00
Kostya Shishkov
2c6361e009 Use pointer to hash transform function to make adding SHA-2 support easier.
Originally committed as revision 19388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 07:23:43 +00:00
Kostya Shishkov
3a7c65077d cosmetics: vertical align AVSHA1 members
Originally committed as revision 19387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 07:15:30 +00:00
Kostya Shishkov
01cc628845 Extend AVSHA1 so it can be used in future SHA-2 code as well
Originally committed as revision 19386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 07:14:07 +00:00
Kostya Shishkov
4364fc9a0d Document SHA-1 functions and structures
Originally committed as revision 19385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 07:07:01 +00:00
Ramiro Polla
71ed6c8f06 Remove dependency from swscale_internal.h to lavu/internal.h, it is no longer
needed for DECLARE_ALIGNED.
Remove dependency from swscale-example.c to swscale_internal.h by duplicating
the necessary code. The duplicated code is a hack and should be removed once a
cleaner pixel format information system exists. swscale-example.c is example
code on how to use the library and therefore shouldn't rely on internal
headers.

Originally committed as revision 29415 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-07-09 02:27:39 +00:00
Ramiro Polla
16c2e21488 Move DECLARE_ALIGNED and DECLARE_ASM_CONST back from lavu/internal.h to
lavu/mem.h.

Originally committed as revision 19384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 02:20:29 +00:00
Ramiro Polla
4b2be143cd Do not throw compiler error if asm code needs alignment, but we do not know
how to do it for this compiler. This removes a dependency of config.h on the
DECLARE_* macros.

Originally committed as revision 19383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-09 02:18:29 +00:00
Alex Converse
f11bfe3065 Reindent after last commit
Originally committed as revision 19382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 23:14:47 +00:00
Alex Converse
48d20c11ba Prevent AAC frame size overflows.
Originally committed as revision 19381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 23:12:53 +00:00
Alex Converse
5962f6b0da Refactor windowing and early psy from bitstream writing parts of the AAC encoder.
Originally committed as revision 19380 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 23:10:13 +00:00
Alex Converse
7a4eebcdce Turn on AAC rate control.
Originally committed as revision 19379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 23:04:22 +00:00
Diego Biurrun
c8f47d8b79 cosmetics: Remove unnecessary {} around if/for blocks;
move statements after if/for to the next line.

Originally committed as revision 19378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 21:36:33 +00:00
Diego Biurrun
99d61d340c cosmetics: prettyprinting, K&R style, break overly long lines
Originally committed as revision 19377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 21:16:06 +00:00
Alex Converse
fd257dc4c0 Cosmetics: Pretty print the AAC encoder.
Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 20:36:45 +00:00
Alex Converse
78e65cd772 Merge the AAC encoder from SoC svn. It is still considered experimental.
Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 20:01:31 +00:00
Reimar Döffinger
5e039e1b4c Add extra validation checks to ff_vorbis_len2vlc.
They should not be necessary, but it seems like a reasonable precaution.

Originally committed as revision 19374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 19:39:23 +00:00
Reimar Döffinger
1de4ba7155 Make sure that values generated for ff_vorbis_len2vlc in
vorbis_parse_setup_hdr_codebooks are in the valid range (<=32).

Originally committed as revision 19373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-08 19:31:04 +00:00