11 years agoProtect config.mak against multiple inclusion
Måns Rullgård [Sun, 12 Jul 2009 21:13:57 +0000 (21:13 +0000)]
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

11 years agoAppend the user CPPFLAGS value to the CPPFLAGS used for compilation,
Stefano Sabatini [Sun, 12 Jul 2009 15:50:25 +0000 (15:50 +0000)]
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

11 years agoUse CFLAGS in default DEPEND_CMD
Måns Rullgård [Sun, 12 Jul 2009 14:13:34 +0000 (14:13 +0000)]
Use CFLAGS in default DEPEND_CMD

Originally committed as revision 19415 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoUse CFLAGS in check_cpp
Måns Rullgård [Sun, 12 Jul 2009 14:13:32 +0000 (14:13 +0000)]
Use CFLAGS in check_cpp

Originally committed as revision 19414 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoSet as_default after compiler detection, allowing compiler-specific defaults
Måns Rullgård [Sun, 12 Jul 2009 13:29:55 +0000 (13:29 +0000)]
Set as_default after compiler detection, allowing compiler-specific defaults

Originally committed as revision 19413 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoPass ASFLAGS to assembler instead of CFLAGS
Måns Rullgård [Sun, 12 Jul 2009 13:29:53 +0000 (13:29 +0000)]
Pass ASFLAGS to assembler instead of CFLAGS

Originally committed as revision 19412 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd flags from --extra-cflags after compiler detection
Måns Rullgård [Sun, 12 Jul 2009 13:29:51 +0000 (13:29 +0000)]
Add flags from --extra-cflags after compiler detection

Originally committed as revision 19411 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoSet CPU selection flags in $cpuflags, add to cflags outside case block
Måns Rullgård [Sun, 12 Jul 2009 13:29:48 +0000 (13:29 +0000)]
Set CPU selection flags in $cpuflags, add to cflags outside case block

Originally committed as revision 19410 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAllow unusual ways of specifying compiler output file
Måns Rullgård [Sun, 12 Jul 2009 13:29:46 +0000 (13:29 +0000)]
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

11 years agoUse DEPCC to find dependencies, default to same as CC
Måns Rullgård [Sun, 12 Jul 2009 13:29:43 +0000 (13:29 +0000)]
Use DEPCC to find dependencies, default to same as CC

Originally committed as revision 19408 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoUse LD for linking, default to same as CC
Måns Rullgård [Sun, 12 Jul 2009 13:29:40 +0000 (13:29 +0000)]
Use LD for linking, default to same as CC

Originally committed as revision 19407 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoSet CFLAGS directly in config.mak instead of using OPTFLAGS
Måns Rullgård [Sun, 12 Jul 2009 13:29:38 +0000 (13:29 +0000)]
Set CFLAGS directly in config.mak instead of using OPTFLAGS

Originally committed as revision 19406 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd --sysroot flag to CPPFLAGS, not CFLAGS
Måns Rullgård [Sun, 12 Jul 2009 13:29:35 +0000 (13:29 +0000)]
Add --sysroot flag to CPPFLAGS, not CFLAGS

Originally committed as revision 19405 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoSeparate C preprocessor flags into CPPFLAGS variable
Måns Rullgård [Sun, 12 Jul 2009 13:29:32 +0000 (13:29 +0000)]
Separate C preprocessor flags into CPPFLAGS variable

Originally committed as revision 19404 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMake VAAPI/VDPAU variant of decoder foo depend on decoder foo.
Diego Biurrun [Sun, 12 Jul 2009 13:22:01 +0000 (13:22 +0000)]
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

11 years agoRemove useless definition of struct AVCLASS.
Stefano Sabatini [Sun, 12 Jul 2009 11:30:42 +0000 (11:30 +0000)]
Remove useless definition of struct AVCLASS.

Originally committed as revision 19402 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoconfigure: allow bulk-disabled things to be re-enabled by dependents
Måns Rullgård [Sun, 12 Jul 2009 00:17:42 +0000 (00:17 +0000)]
configure: allow bulk-disabled things to be re-enabled by dependents

Originally committed as revision 19401 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCosmetics: reindent after last commit
Alex Converse [Fri, 10 Jul 2009 21:54:06 +0000 (21:54 +0000)]
Cosmetics: reindent after last commit

Originally committed as revision 19400 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoIgnore subsequent channel configurations after the first in an AAC file. The
Alex Converse [Fri, 10 Jul 2009 21:53:04 +0000 (21:53 +0000)]
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

11 years agoMark iir filter init and free functions av_cold.
Alex Converse [Fri, 10 Jul 2009 20:55:15 +0000 (20:55 +0000)]
Mark iir filter init and free functions av_cold.

Originally committed as revision 19398 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoFix "iirfilter.c:55: warning: unused variable ‘size’"
Alex Converse [Fri, 10 Jul 2009 20:51:22 +0000 (20:51 +0000)]
Fix "iirfilter.c:55: warning: unused variable ‘size’"

Originally committed as revision 19397 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoEliminate use of complex.h from iirfilter.c
Alex Converse [Fri, 10 Jul 2009 20:45:13 +0000 (20:45 +0000)]
Eliminate use of complex.h from iirfilter.c

Originally committed as revision 19396 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd a log2 replacement for systems that haven't quite caught up with the C99
Alex Converse [Fri, 10 Jul 2009 19:20:06 +0000 (19:20 +0000)]
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

11 years agoPrepare SHA code to handle SHA-2 as well. For now rename files and functions
Kostya Shishkov [Fri, 10 Jul 2009 15:50:49 +0000 (15:50 +0000)]
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

11 years agocygwin documentation: diffutils is part of the Utils packages.
Ramiro Polla [Fri, 10 Jul 2009 00:16:20 +0000 (00:16 +0000)]
cygwin documentation: diffutils is part of the Utils packages.

Originally committed as revision 19393 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd myself as AAC encoder maintainer
Alex Converse [Thu, 9 Jul 2009 17:35:56 +0000 (17:35 +0000)]
Add myself as AAC encoder maintainer

Originally committed as revision 19392 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoChange fminf/fmaxf to FFMIN/FFMAX to fix the build on broken operating systems.
Alex Converse [Thu, 9 Jul 2009 17:22:59 +0000 (17:22 +0000)]
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

11 years agoFix declarations of complex numbers
Måns Rullgård [Thu, 9 Jul 2009 10:16:00 +0000 (10:16 +0000)]
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

11 years agoRename function to sha1_transform so it won't be confused with SHA-2 transform
Kostya Shishkov [Thu, 9 Jul 2009 07:29:03 +0000 (07:29 +0000)]
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

11 years agoUse pointer to hash transform function to make adding SHA-2 support easier.
Kostya Shishkov [Thu, 9 Jul 2009 07:23:43 +0000 (07:23 +0000)]
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

11 years agocosmetics: vertical align AVSHA1 members
Kostya Shishkov [Thu, 9 Jul 2009 07:15:30 +0000 (07:15 +0000)]
cosmetics: vertical align AVSHA1 members

Originally committed as revision 19387 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoExtend AVSHA1 so it can be used in future SHA-2 code as well
Kostya Shishkov [Thu, 9 Jul 2009 07:14:07 +0000 (07:14 +0000)]
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

11 years agoDocument SHA-1 functions and structures
Kostya Shishkov [Thu, 9 Jul 2009 07:07:01 +0000 (07:07 +0000)]
Document SHA-1 functions and structures

Originally committed as revision 19385 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoRemove dependency from swscale_internal.h to lavu/internal.h, it is no longer
Ramiro Polla [Thu, 9 Jul 2009 02:27:39 +0000 (02:27 +0000)]
Remove dependency from swscale_internal.h to lavu/internal.h, it is no longer
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

Originally committed as revision 29415 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoMove DECLARE_ALIGNED and DECLARE_ASM_CONST back from lavu/internal.h to
Ramiro Polla [Thu, 9 Jul 2009 02:20:29 +0000 (02:20 +0000)]
Move DECLARE_ALIGNED and DECLARE_ASM_CONST back from lavu/internal.h to

Originally committed as revision 19384 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoDo not throw compiler error if asm code needs alignment, but we do not know
Ramiro Polla [Thu, 9 Jul 2009 02:18:29 +0000 (02:18 +0000)]
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

11 years agoReindent after last commit
Alex Converse [Wed, 8 Jul 2009 23:14:47 +0000 (23:14 +0000)]
Reindent after last commit

Originally committed as revision 19382 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoPrevent AAC frame size overflows.
Alex Converse [Wed, 8 Jul 2009 23:12:53 +0000 (23:12 +0000)]
Prevent AAC frame size overflows.

Originally committed as revision 19381 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoRefactor windowing and early psy from bitstream writing parts of the AAC encoder.
Alex Converse [Wed, 8 Jul 2009 23:10:13 +0000 (23:10 +0000)]
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

11 years agoTurn on AAC rate control.
Alex Converse [Wed, 8 Jul 2009 23:04:22 +0000 (23:04 +0000)]
Turn on AAC rate control.

Originally committed as revision 19379 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agocosmetics: Remove unnecessary {} around if/for blocks;
Diego Biurrun [Wed, 8 Jul 2009 21:36:33 +0000 (21:36 +0000)]
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

11 years agocosmetics: prettyprinting, K&R style, break overly long lines
Diego Biurrun [Wed, 8 Jul 2009 21:16:06 +0000 (21:16 +0000)]
cosmetics: prettyprinting, K&R style, break overly long lines

Originally committed as revision 19377 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCosmetics: Pretty print the AAC encoder.
Alex Converse [Wed, 8 Jul 2009 20:36:45 +0000 (20:36 +0000)]
Cosmetics: Pretty print the AAC encoder.

Originally committed as revision 19376 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMerge the AAC encoder from SoC svn. It is still considered experimental.
Alex Converse [Wed, 8 Jul 2009 20:01:31 +0000 (20:01 +0000)]
Merge the AAC encoder from SoC svn. It is still considered experimental.

Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd extra validation checks to ff_vorbis_len2vlc.
Reimar Döffinger [Wed, 8 Jul 2009 19:39:23 +0000 (19:39 +0000)]
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

11 years agoMake sure that values generated for ff_vorbis_len2vlc in
Reimar Döffinger [Wed, 8 Jul 2009 19:31:04 +0000 (19:31 +0000)]
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

11 years agoAdd PIX_FMT_ARGB encoding to qtrle.
Alexis Ballier [Wed, 8 Jul 2009 14:58:16 +0000 (14:58 +0000)]
Add PIX_FMT_ARGB encoding to qtrle.

Patch by Alexis Ballier, alexis ballier gmail

Originally committed as revision 19372 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd block_align to sox input.
Phil Rutschman [Wed, 8 Jul 2009 08:52:56 +0000 (08:52 +0000)]
Add block_align to sox input.
Patch by Phil Rutschman: name.surname modsystems com

Originally committed as revision 19371 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoFix mem leak when user preallocates an AVFormatContext, passes it to
Art Clarke [Wed, 8 Jul 2009 08:26:57 +0000 (08:26 +0000)]
Fix mem leak when user preallocates an AVFormatContext, passes it to
av_open_input_file(), but the file does not exist.
Patch by Art Clarke a$(surname) xuggle com

Originally committed as revision 19370 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoBaptiste will maintain qt-faststart from now on.
Diego Biurrun [Tue, 7 Jul 2009 22:00:13 +0000 (22:00 +0000)]
Baptiste will maintain qt-faststart from now on.

Originally committed as revision 19369 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMention removal of libamr support in the changelog.
Diego Biurrun [Tue, 7 Jul 2009 21:39:49 +0000 (21:39 +0000)]
Mention removal of libamr support in the changelog.

Originally committed as revision 19368 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agowhitespace cosmetics: Realign colums after last commit.
Diego Biurrun [Tue, 7 Jul 2009 09:33:53 +0000 (09:33 +0000)]
whitespace cosmetics: Realign colums after last commit.

Originally committed as revision 19367 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCheck for CONFIG_LIBFOO_DECODER/CONFIG_LIBFOO_ENCODER instead of just
Diego Biurrun [Tue, 7 Jul 2009 09:33:08 +0000 (09:33 +0000)]
CONFIG_LIBFOO in the external libraries section.
This is more consistent with the rest of the Makefiles, it makes clearer what
is actually implemented and should be advantageous if we implement an external
library encoder where we previously just had the decoder and vice versa.

Originally committed as revision 19366 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoRemove support for nonfree libamr library for AMR-NB/WB decoding/encoding.
Diego Biurrun [Tue, 7 Jul 2009 00:28:16 +0000 (00:28 +0000)]
Remove support for nonfree libamr library for AMR-NB/WB decoding/encoding.
libopencore can now be used as a replacement except for AMR-WB encoding.

Originally committed as revision 19365 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoflvdec: expose metadata through the generic metadata API
Aurelien Jacobs [Mon, 6 Jul 2009 21:54:37 +0000 (21:54 +0000)]
flvdec: expose metadata through the generic metadata API
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19364 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoflvdec: re-enable metadata parsing
Aurelien Jacobs [Mon, 6 Jul 2009 21:49:33 +0000 (21:49 +0000)]
flvdec: re-enable metadata parsing
duration and videodatarate values are actually useful
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19363 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoflvdec: don't set format and codec context from metadata values
Aurelien Jacobs [Mon, 6 Jul 2009 21:46:37 +0000 (21:46 +0000)]
flvdec: don't set format and codec context from metadata values
This has proven to be useless and even harmfull since r18460 (expect
for duration and videodatarate).
original patch from Art Clarke  aclarke _at_ xuggle _dot_ com

Originally committed as revision 19362 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCheck for packet_length 0, it is already treated as invalid by the padding check,
Reimar Döffinger [Mon, 6 Jul 2009 17:08:32 +0000 (17:08 +0000)]
Check for packet_length 0, it is already treated as invalid by the padding check,
but that resulted in a confusing/wrong error message.

Originally committed as revision 19361 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoChange av_free to av_freep
Reimar Döffinger [Mon, 6 Jul 2009 16:49:36 +0000 (16:49 +0000)]
Change av_free to av_freep

Originally committed as revision 19360 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoReallocate internal buffer when coded frame size changes.
Reimar Döffinger [Mon, 6 Jul 2009 16:48:23 +0000 (16:48 +0000)]
Reallocate internal buffer when coded frame size changes.
Fixes out-of-bounds reads and writes with i32/smclocki32.avi.1.0 from issue 1240.

Originally committed as revision 19359 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoChange iv_decode_frame to get AVCodecContext as argument, so that
Reimar Döffinger [Mon, 6 Jul 2009 16:45:12 +0000 (16:45 +0000)]
Change iv_decode_frame to get AVCodecContext as argument, so that
avcodec_check_dimensions can be called with a proper context instead of NULL.

Originally committed as revision 19358 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoRemove useless ret variable added in last revision again.
Reimar Döffinger [Mon, 6 Jul 2009 10:28:58 +0000 (10:28 +0000)]
Remove useless ret variable added in last revision again.

Originally committed as revision 19357 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years ago100l, theora_decode_init must pass on errors from vp3_decode_init
Reimar Döffinger [Mon, 6 Jul 2009 09:35:00 +0000 (09:35 +0000)]
100l, theora_decode_init must pass on errors from vp3_decode_init

Originally committed as revision 19356 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMake decode_init fail if the huffman tables are invalid and thus init_vlc fails.
Reimar Döffinger [Mon, 6 Jul 2009 09:22:39 +0000 (09:22 +0000)]
Make decode_init fail if the huffman tables are invalid and thus init_vlc fails.
Otherwise this will crash during decoding because the vlc tables are NULL.
Partially fixes ogv/smclock.ogv.1.101.ogv from issue 1240.

Originally committed as revision 19355 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoDo not fail if 'uuid' atom is encountered before 'moov'.
Frank Barchard [Mon, 6 Jul 2009 05:36:14 +0000 (05:36 +0000)]
Do not fail if 'uuid' atom is encountered before 'moov'.
Patch by Frank Barchard, fbarchard at google dot com.

Originally committed as revision 19354 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agolibfaac no longer claims to be LGPL.
Diego Biurrun [Mon, 6 Jul 2009 05:22:50 +0000 (05:22 +0000)]
libfaac no longer claims to be LGPL.

Originally committed as revision 19353 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoThe AltiVec code in libswscale no longer is under GPL.
Diego Biurrun [Sun, 5 Jul 2009 20:10:59 +0000 (20:10 +0000)]
The AltiVec code in libswscale no longer is under GPL.
Remove one erroneous preprocessor check for CONFIG_GPL in the AltiVec code.

Originally committed as revision 29412 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale

11 years agoEnsure that the filter limit values do not exceed the maximum allowed value of 127.
Reimar Döffinger [Sun, 5 Jul 2009 18:27:39 +0000 (18:27 +0000)]
Ensure that the filter limit values do not exceed the maximum allowed value of 127.

Originally committed as revision 19351 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoExtend init_loop_filter to work for filter limit values up to 127 instead
Reimar Döffinger [Sun, 5 Jul 2009 18:25:58 +0000 (18:25 +0000)]
Extend init_loop_filter to work for filter limit values up to 127 instead
of only up to 64. 127 is the maximum value allowed by the theora specification.

Originally committed as revision 19350 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd a check to vp6_parse_coeff_huffman to ensure it does not overread the input buffer.
Reimar Döffinger [Sun, 5 Jul 2009 16:01:51 +0000 (16:01 +0000)]
Add a check to vp6_parse_coeff_huffman to ensure it does not overread the input buffer.

Originally committed as revision 19349 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agovp56dec: ensure range coder won't read past the end of input buffer
Aurelien Jacobs [Sun, 5 Jul 2009 15:23:42 +0000 (15:23 +0000)]
vp56dec: ensure range coder won't read past the end of input buffer

Originally committed as revision 19348 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCheck that palctrl is available on init instead of crashing when trying to use
Reimar Döffinger [Sun, 5 Jul 2009 12:14:05 +0000 (12:14 +0000)]
Check that palctrl is available on init instead of crashing when trying to use
it on decode.
Fixes mpeg2/smclockmpeg2.avi.2.1 from issue 1240.

Originally committed as revision 19347 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agofix a buffer overrun on corrupt huffyuv streams
Loren Merritt [Sat, 4 Jul 2009 23:59:10 +0000 (23:59 +0000)]
fix a buffer overrun on corrupt huffyuv streams

Originally committed as revision 19346 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoARM: NEON VP3 IDCT
David Conrad [Sat, 4 Jul 2009 20:41:11 +0000 (20:41 +0000)]
15% faster VP3/Theora, 10% faster VP6

Originally committed as revision 19345 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoIf the end of the input buffer is reached while decoding MJPEG and at least
Reimar Döffinger [Sat, 4 Jul 2009 18:24:43 +0000 (18:24 +0000)]
If the end of the input buffer is reached while decoding MJPEG and at least
a valid SOF was found, emulate an EOI.
This allows e.g. to at least decode the available part of incomplete MJPEG frames.

Originally committed as revision 19344 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMake the MJPEG decoder return -1 when no image was decoded so that decode
Reimar Döffinger [Sat, 4 Jul 2009 18:22:33 +0000 (18:22 +0000)]
Make the MJPEG decoder return -1 when no image was decoded so that decode
errors are actually recognizable as such.

Originally committed as revision 19343 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd a got_picture flag to MJpegDecodeContext which indicates if its picture
Reimar Döffinger [Sat, 4 Jul 2009 18:20:35 +0000 (18:20 +0000)]
Add a got_picture flag to MJpegDecodeContext which indicates if its picture
element is valid. Skip the code handling SOS and EOI if not, since it can not
work without a valid AVPicture.
This fixes a crash with mjpeg/smclockmjpeg.avi.1.0 from issue 1240 where the
decoder returned an invalid AVPicture.

Originally committed as revision 19342 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agomjpegdec: check that the coded dc_index and ac_index have a valid associated VLC...
Reimar Döffinger [Sat, 4 Jul 2009 12:54:36 +0000 (12:54 +0000)]
mjpegdec: check that the coded dc_index and ac_index have a valid associated VLC table.
Removes some disabled dc_index/ac_index checking code that seems to have had
some undocumented issues and should not really be necessary anymore now.
Fixes from issue 1240 the files mjpeg/smclockmjpeg.avi.1.10 and mjpeg/smclockmjpeg.avi.1.171.

Originally committed as revision 19341 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoUse enum CodecID instead of int.
Carl Eugen Hoyos [Sat, 4 Jul 2009 08:18:03 +0000 (08:18 +0000)]
Use enum CodecID instead of int.
Fixes the following icc warning:
warning #188: enumerated type mixed with another type

Originally committed as revision 19340 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agofix and simplify long gop mpeg codec ul computation
Baptiste Coudurier [Sat, 4 Jul 2009 08:02:01 +0000 (08:02 +0000)]
fix and simplify long gop mpeg codec ul computation

Originally committed as revision 19339 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoset index duration to 0 for cbr, specifying whole container coverage
Baptiste Coudurier [Sat, 4 Jul 2009 07:56:58 +0000 (07:56 +0000)]
set index duration to 0 for cbr, specifying whole container coverage

Originally committed as revision 19338 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agouse ber4 length for descriptors preferred by specs
Baptiste Coudurier [Sat, 4 Jul 2009 07:52:28 +0000 (07:52 +0000)]
use ber4 length for descriptors preferred by specs

Originally committed as revision 19337 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agowrite profile and level local tag in mpeg descriptor
Baptiste Coudurier [Sat, 4 Jul 2009 07:49:12 +0000 (07:49 +0000)]
write profile and level local tag in mpeg descriptor

Originally committed as revision 19336 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoH.264: Check the return value of decode_vui_parameters()
Alexander Strange [Sat, 4 Jul 2009 07:46:58 +0000 (07:46 +0000)]
H.264: Check the return value of decode_vui_parameters()

Files with invalid VUI are now rejected like
other invalid SPS are.

Fixes issue1231.

Originally committed as revision 19335 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoReplace invalid Theora frame rate by 25 FPS.
Reimar Döffinger [Fri, 3 Jul 2009 11:31:09 +0000 (11:31 +0000)]
Replace invalid Theora frame rate by 25 FPS.
Avoids division by 0 due to e.g. time_base denominator being 0.

Originally committed as revision 19334 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCheck for failed extradata malloc, fixes a crash in out-of-memory conditions
Reimar Döffinger [Fri, 3 Jul 2009 11:27:52 +0000 (11:27 +0000)]
Check for failed extradata malloc, fixes a crash in out-of-memory conditions
or with extremely large extradata.

Originally committed as revision 19333 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCheck size of "strf" header against size of enclosing "LIST" if there is one.
Reimar Döffinger [Fri, 3 Jul 2009 11:26:14 +0000 (11:26 +0000)]
Check size of "strf" header against size of enclosing "LIST" if there is one.

Originally committed as revision 19332 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoFix indentation
Reimar Döffinger [Fri, 3 Jul 2009 11:18:56 +0000 (11:18 +0000)]
Fix indentation

Originally committed as revision 19331 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAvoid divisions by 0 in the ASF demuxer if packet_size is not valid.
Reimar Döffinger [Fri, 3 Jul 2009 11:18:07 +0000 (11:18 +0000)]
Avoid divisions by 0 in the ASF demuxer if packet_size is not valid.

Originally committed as revision 19330 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoH.264: Don't set data_partitioning for invalid NAL_DPA.
Alexander Strange [Fri, 3 Jul 2009 05:52:00 +0000 (05:52 +0000)]
H.264: Don't set data_partitioning for invalid NAL_DPA.

Before, the decoder could interpret a corrupt frame
as a NAL_DPA and NAL_DPC, and then start decoding
even if decode_slice_header() returned an error.
This frequently caused crashes.

Fixes issue1228, issue1229, and partially issue1238.

Originally committed as revision 19328 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoCleanup properly at the end of MPEG Audio parsing.
Art Clarke [Thu, 2 Jul 2009 13:13:20 +0000 (13:13 +0000)]
Cleanup properly at the end of MPEG Audio parsing.
Patch by Art Clarke (aclarke AT xuggle com)

Originally committed as revision 19327 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoIf either of num or den is 0 make both 0 in av_set_pts_info().
Michael Niedermayer [Thu, 2 Jul 2009 12:47:58 +0000 (12:47 +0000)]
If either of num or den is 0 make both 0 in av_set_pts_info().

Originally committed as revision 19326 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMake sure av_set_pts_info() does not set the fields of a timebase to
Michael Niedermayer [Wed, 1 Jul 2009 20:52:48 +0000 (20:52 +0000)]
Make sure av_set_pts_info() does not set the fields of a timebase to
negative values.

Originally committed as revision 19325 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoRevert r19317, "simplify slice_end, return size of output frame".
Baptiste Coudurier [Wed, 1 Jul 2009 20:35:28 +0000 (20:35 +0000)]
Revert r19317, "simplify slice_end, return size of output frame".
It returns non decodable B-frames.

Originally committed as revision 19324 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoindent
Michael Niedermayer [Wed, 1 Jul 2009 20:34:16 +0000 (20:34 +0000)]

Originally committed as revision 19323 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMake sure we dont read over the end.
Michael Niedermayer [Wed, 1 Jul 2009 20:30:37 +0000 (20:30 +0000)]
Make sure we dont read over the end.
Fixes issue1237.

Originally committed as revision 19322 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoAdd an explanation and complete the metadata usage example.
Stefano Sabatini [Wed, 1 Jul 2009 20:11:53 +0000 (20:11 +0000)]
Add an explanation and complete the metadata usage example.

Originally committed as revision 19320 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoMake arguments of av_set_pts_info() unsigned.
Michael Niedermayer [Wed, 1 Jul 2009 18:50:31 +0000 (18:50 +0000)]
Make arguments of av_set_pts_info() unsigned.
Fixes issue1240/mpeg1/smclockmpeg1.avi.3.1

Originally committed as revision 19319 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agoFix potentially unaligned accesses in ff_copy_bits()
Måns Rullgård [Wed, 1 Jul 2009 17:48:22 +0000 (17:48 +0000)]
Fix potentially unaligned accesses in ff_copy_bits()

A pointer should never be assigned a value which may have less than the
required alignment of the target type.  Compilers may assume pointer
values have the required alignment, and emit normal load/store instructions.

Unaligned pointers should use a character type or compiler-specific
type modifiers.

Originally committed as revision 19318 to svn://svn.ffmpeg.org/ffmpeg/trunk

11 years agosimplify slice_end, return size of output frame
Baptiste Coudurier [Wed, 1 Jul 2009 17:29:52 +0000 (17:29 +0000)]
simplify slice_end, return size of output frame

Originally committed as revision 19317 to svn://svn.ffmpeg.org/ffmpeg/trunk