ffmpeg.git
7 years agov210enc: check for coded_frame allocation failure
Paul B Mahol [Sun, 5 Feb 2012 21:14:34 +0000 (21:14 +0000)]
v210enc: check for coded_frame allocation failure

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodrawtext: add 'fix_bounds' option on coords fixing
Andrey Utkin [Sun, 5 Feb 2012 12:41:01 +0000 (14:41 +0200)]
drawtext: add 'fix_bounds' option on coords fixing

Before, drawtext filter deliberately altered given text coordinates if
text didn't fully fit on the picture. This breaks the use case of
scrolling large text, e.g. movie closing credits.
Add 'fix_bounds', to make it usable in such cases (by setting its value to 0).
Default behavior is not changed, and non-fitting text coords are fixed.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodrawtext: fix text_{w, h} expression vars
Andrey Utkin [Sat, 4 Feb 2012 22:14:16 +0000 (00:14 +0200)]
drawtext: fix text_{w, h} expression vars

Before, {text_,}{w,h} vars hadn't got initialized

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agodrawtext: add missing braces around an if() block.
Andrey Utkin [Sat, 4 Feb 2012 22:14:15 +0000 (00:14 +0200)]
drawtext: add missing braces around an if() block.

Prevents uninitialized read.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
7 years agoape: fix seeking
Paul B Mahol [Fri, 3 Feb 2012 18:30:18 +0000 (18:30 +0000)]
ape: fix seeking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoapedec: 8bit and 24bit support
Paul B Mahol [Fri, 3 Feb 2012 15:37:06 +0000 (15:37 +0000)]
apedec: 8bit and 24bit support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agodsputil: remove debug message in dsputil_init().
Justin Ruggles [Wed, 10 Aug 2011 13:39:43 +0000 (09:39 -0400)]
dsputil: remove debug message in dsputil_init().

AVCodecContext.bits_per_raw_sample is used for audio too, and values other
than 8, 9, and 10 are valid.

7 years agomovdec: Avoid av_malloc(0) in stss
Alex Converse [Fri, 3 Feb 2012 18:43:21 +0000 (10:43 -0800)]
movdec: Avoid av_malloc(0) in stss

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agobuild: Drop YASM-OBJS-FFT from SUBDIR_VARS.
Diego Biurrun [Thu, 2 Feb 2012 22:39:23 +0000 (23:39 +0100)]
build: Drop YASM-OBJS-FFT from SUBDIR_VARS.

FFT code only appears in libavcodec, so there is no need to reset the variable
when the build templates are instantiated for other libraries.

7 years agobuild: Drop unused X86-OBJS variable.
Diego Biurrun [Thu, 2 Feb 2012 22:37:30 +0000 (23:37 +0100)]
build: Drop unused X86-OBJS variable.

7 years agoavconv: remove debugging cruft from do_video_out().
Anton Khirnov [Wed, 1 Feb 2012 09:25:19 +0000 (10:25 +0100)]
avconv: remove debugging cruft from do_video_out().

7 years agoavconv: factorize setting stream_index for the output packet.
Anton Khirnov [Wed, 1 Feb 2012 09:23:28 +0000 (10:23 +0100)]
avconv: factorize setting stream_index for the output packet.

7 years agoframe{crc/md5}: set the stream timebase from codec timebase.
Anton Khirnov [Thu, 2 Feb 2012 13:20:43 +0000 (14:20 +0100)]
frame{crc/md5}: set the stream timebase from codec timebase.

Right now those muxers use the default timebase in all cases(1/90000).

This patch avoid unnecessary rescaling and makes the printed timestamps
more readable.

Also, extend the printed information to include the timebases and packet
pts/duration and align the columns.

Obviously changes the results of all fate tests which use those two
muxers.

7 years agoapedec: remove unneeded #include of get_bits.h and associated macro
Justin Ruggles [Thu, 2 Feb 2012 01:14:42 +0000 (20:14 -0500)]
apedec: remove unneeded #include of get_bits.h and associated macro

7 years agoapedec: av_fast_malloc() instead of av_realloc()
Justin Ruggles [Mon, 30 Jan 2012 19:57:21 +0000 (14:57 -0500)]
apedec: av_fast_malloc() instead of av_realloc()

av_realloc() does not guarantee alignment, which is required for
DSPContext.bswap_buf().

7 years agoapedec: fix handling of packet sizes that are not a multiple of 4 bytes
Justin Ruggles [Thu, 2 Feb 2012 01:11:36 +0000 (20:11 -0500)]
apedec: fix handling of packet sizes that are not a multiple of 4 bytes

7 years agolibx264: fix indentation.
Anton Khirnov [Wed, 1 Feb 2012 09:56:14 +0000 (10:56 +0100)]
libx264: fix indentation.

7 years agovorbis: fix overflows in floor1[] vector and inverse db table index.
Ronald S. Bultje [Wed, 11 Jan 2012 01:01:26 +0000 (17:01 -0800)]
vorbis: fix overflows in floor1[] vector and inverse db table index.

7 years agowin64: add a XMM clobber test configure option.
Ronald S. Bultje [Thu, 2 Feb 2012 19:48:13 +0000 (11:48 -0800)]
win64: add a XMM clobber test configure option.

This will be useful to test more aggressively for failures to mark XMM
registers as clobbered in Win64 builds, and prevent regressions thereof.

Based on a patch by Ramiro Polla <ramiro.polla@gmail.com>

7 years agomovdec: Parse the dvc1 atom
Martin Storsjö [Sat, 21 Jan 2012 23:32:16 +0000 (01:32 +0200)]
movdec: Parse the dvc1 atom

Normally, the actual payload data contains sequence headers, too,
and the parser can extract this and set it as extradata. However,
the data in the dvc1 atom is the "official" extradata for the file.

This is required for proper stream copy of vc1 from ismv to ismv.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoARM: ac3: fix ac3_bit_alloc_calc_bap_armv6
Mans Rullgard [Wed, 1 Feb 2012 22:25:10 +0000 (22:25 +0000)]
ARM: ac3: fix ac3_bit_alloc_calc_bap_armv6

This function was broken when the start bin was not at the start
of a band.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoswscale: K&R formatting cosmetics for Blackfin code
Diego Biurrun [Wed, 18 Jan 2012 22:56:49 +0000 (23:56 +0100)]
swscale: K&R formatting cosmetics for Blackfin code

Also prettyprint some comments in Assembly code.

7 years agofrwu: lowercase the FRWU codec name
Piotr Bandurski [Wed, 1 Feb 2012 20:23:33 +0000 (20:23 +0000)]
frwu: lowercase the FRWU codec name

This is more consistent with all the other codec names.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agomovdec: fix dts generation in fragmented files
Janne Grunau [Thu, 2 Feb 2012 15:30:27 +0000 (16:30 +0100)]
movdec: fix dts generation in fragmented files

Do not use AVStream's duration for dts generation since it contains in
some cases the duration of the whole file instead of duration of the
samples in the moov. This happens if the mdhd holds the duration of the
whole file but has no entries or a zero duration in its stts.

7 years agofate: make acodec-ac3_fixed test output raw AC3
Mans Rullgard [Thu, 2 Feb 2012 01:46:05 +0000 (01:46 +0000)]
fate: make acodec-ac3_fixed test output raw AC3

There is no point in this test using the RM format.

Signed-off-by: Mans Rullgard <mans@mansr.com>
7 years agoAPIchanges: add missing commit hashes
Janne Grunau [Wed, 1 Feb 2012 18:22:54 +0000 (19:22 +0100)]
APIchanges: add missing commit hashes

7 years agoswscale: implement MMX, SSE2 and AVX functions for RGB32 input.
Ronald S. Bultje [Thu, 2 Feb 2012 05:55:32 +0000 (21:55 -0800)]
swscale: implement MMX, SSE2 and AVX functions for RGB32 input.

7 years agora144enc: drop pointless "encoder" from .long_name
Paul B Mahol [Thu, 2 Feb 2012 01:10:19 +0000 (01:10 +0000)]
ra144enc: drop pointless "encoder" from .long_name

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agobethsoftvideo: fix palette reading.
Justin Ruggles [Wed, 18 Jan 2012 18:09:43 +0000 (13:09 -0500)]
bethsoftvideo: fix palette reading.

Return the correct number of consumed bytes and set *data_size = 0.
Returned size is 1 too small, leading to that 1 byte being read as the next
frame, which results in an extra blank frame at the beginning of the stream.

7 years agompc7: use av_fast_padded_malloc()
Justin Ruggles [Tue, 31 Jan 2012 16:17:04 +0000 (11:17 -0500)]
mpc7: use av_fast_padded_malloc()

Avoids doing malloc/free for each frame.
Also fixes valgrind errors due to use of uninitialized padding bytes.

Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>

7 years agompc7: simplify handling of packet sizes that are not a multiple of 4 bytes
Justin Ruggles [Wed, 1 Feb 2012 20:19:50 +0000 (15:19 -0500)]
mpc7: simplify handling of packet sizes that are not a multiple of 4 bytes

7 years agodoc: decoding Forward Uncompressed is supported
Paul B Mahol [Wed, 1 Feb 2012 20:30:33 +0000 (20:30 +0000)]
doc: decoding Forward Uncompressed is supported

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoFix a typo in the x86 asm version of ff_vector_clip_int32()
Justin Ruggles [Thu, 2 Feb 2012 00:02:32 +0000 (19:02 -0500)]
Fix a typo in the x86 asm version of ff_vector_clip_int32()

Specifies the correct number of xmm registers used so that they can be saved
and restored on Win64 if necessary.

7 years agopcmenc: Do not set avpkt->size.
Justin Ruggles [Wed, 1 Feb 2012 21:26:37 +0000 (16:26 -0500)]
pcmenc: Do not set avpkt->size.

It is already the correct size as set by ff_alloc_packet().

7 years agoff_alloc_packet: modify the size of the packet to match the requested size
Justin Ruggles [Wed, 1 Feb 2012 21:23:19 +0000 (16:23 -0500)]
ff_alloc_packet: modify the size of the packet to match the requested size

This will simplify encoders which use this function to request the exact
packet size rather than the maximum size.

7 years agofrwu: Employ more meaningful return values.
Paul B Mahol [Wed, 1 Feb 2012 21:05:16 +0000 (21:05 +0000)]
frwu: Employ more meaningful return values.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agofraps: Use av_fast_padded_malloc() instead of av_realloc()
Reimar Döffinger [Tue, 31 Jan 2012 16:30:34 +0000 (11:30 -0500)]
fraps: Use av_fast_padded_malloc() instead of av_realloc()

Ensures alignment and avoids using uninitialized data.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agomjpegdec: use av_fast_padded_malloc()
Reimar Döffinger [Mon, 30 Jan 2012 23:35:35 +0000 (18:35 -0500)]
mjpegdec: use av_fast_padded_malloc()

also check for allocation failure

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoeatqi: use av_fast_padded_malloc()
Reimar Döffinger [Mon, 30 Jan 2012 23:34:10 +0000 (18:34 -0500)]
eatqi: use av_fast_padded_malloc()

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoasv1: use av_fast_padded_malloc()
Reimar Döffinger [Mon, 30 Jan 2012 23:33:32 +0000 (18:33 -0500)]
asv1: use av_fast_padded_malloc()

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoavcodec: Add av_fast_padded_malloc().
Janne Grunau [Tue, 31 Jan 2012 15:40:11 +0000 (15:40 +0000)]
avcodec: Add av_fast_padded_malloc().

Wrapper around av_fast_malloc() that keeps FF_INPUT_BUFFER_PADDING_SIZE
zero-padded bytes at the end of the used buffer.

Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>.

7 years agoswscale: enable dithering in MMX functions.
Ronald S. Bultje [Wed, 1 Feb 2012 15:38:57 +0000 (07:38 -0800)]
swscale: enable dithering in MMX functions.

This was accidently disabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoswscale: make rgb24 function macros slightly smaller.
Ronald S. Bultje [Wed, 1 Feb 2012 15:38:54 +0000 (07:38 -0800)]
swscale: make rgb24 function macros slightly smaller.

7 years agoavcodec.h: Remove some disabled cruft.
Diego Biurrun [Wed, 1 Feb 2012 13:58:10 +0000 (14:58 +0100)]
avcodec.h: Remove some disabled cruft.

7 years agoswscale: remove obsolete comment.
Ronald S. Bultje [Wed, 1 Feb 2012 04:35:58 +0000 (20:35 -0800)]
swscale: remove obsolete comment.

7 years agoswscale-test: Drop unused argc and argv arguments from main().
Diego Biurrun [Fri, 13 Jan 2012 16:01:18 +0000 (17:01 +0100)]
swscale-test: Drop unused argc and argv arguments from main().

7 years agozmbv: Employ more meaningful return values.
Paul B Mahol [Wed, 1 Feb 2012 00:35:29 +0000 (00:35 +0000)]
zmbv: Employ more meaningful return values.

Also use av_log_ask_for_sample() where it makes sense.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agozmbvenc: Employ more meaningful return values.
Paul B Mahol [Tue, 31 Jan 2012 23:59:10 +0000 (23:59 +0000)]
zmbvenc: Employ more meaningful return values.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovc1: prevent null pointer dereference on broken files
Janne Grunau [Wed, 25 Jan 2012 14:49:54 +0000 (15:49 +0100)]
vc1: prevent null pointer dereference on broken files

CC: libav-stable@libav.org
7 years agozmbv: check av_realloc() return values and avoid memleaks on ENOMEM
Janne Grunau [Wed, 1 Feb 2012 00:00:17 +0000 (01:00 +0100)]
zmbv: check av_realloc() return values and avoid memleaks on ENOMEM

7 years agotruespeech: align buffer
Paul B Mahol [Wed, 1 Feb 2012 05:30:18 +0000 (05:30 +0000)]
truespeech: align buffer

DSPContext.bswap_buf() requires aligned output

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoac3: Do not read past the end of ff_ac3_band_start_tab.
Mans Rullgard [Tue, 31 Jan 2012 18:20:33 +0000 (10:20 -0800)]
ac3: Do not read past the end of ff_ac3_band_start_tab.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agodv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
Alex Converse [Thu, 26 Jan 2012 23:08:26 +0000 (15:08 -0800)]
dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.

Found with asan.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agodv: Fix null pointer dereference due to ach=0
Michael Niedermayer [Tue, 24 Jan 2012 16:51:40 +0000 (17:51 +0100)]
dv: Fix null pointer dereference due to ach=0

dv: Fix null pointer dereference due to ach=0

Fixes part2 of CVE-2011-3929

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agodv: check stype
Michael Niedermayer [Tue, 24 Jan 2012 16:48:23 +0000 (17:48 +0100)]
dv: check stype

dv: check stype

Fixes part1 of CVE-2011-3929
Possibly fixes part of CVE-2011-3936

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agofate-golomb: extend golomb-test to get_ue_golomb_long()
Janne Grunau [Tue, 31 Jan 2012 20:39:48 +0000 (21:39 +0100)]
fate-golomb: extend golomb-test to get_ue_golomb_long()

get_ue_golomb_long() is only tested for values up to 2^15 - 2 since
we can not write larger values.
Silence the test on success and return a non-zero value on error.
Use an heap scratch buffer instead of large stack buffer.
Remove unneeded includes.

7 years agoswfdec: Simplify sample rate calculation.
Alex Converse [Tue, 31 Jan 2012 17:55:06 +0000 (09:55 -0800)]
swfdec: Simplify sample rate calculation.

7 years agofate: add golomb-test
Diego Biurrun [Mon, 30 Jan 2012 11:58:20 +0000 (12:58 +0100)]
fate: add golomb-test

7 years agogolomb-test: K&R formatting cosmetics
Diego Biurrun [Mon, 30 Jan 2012 10:30:13 +0000 (11:30 +0100)]
golomb-test: K&R formatting cosmetics

7 years agoh264: Split h264-test off into a separate file - golomb-test.c.
Diego Biurrun [Mon, 30 Jan 2012 11:50:16 +0000 (12:50 +0100)]
h264: Split h264-test off into a separate file - golomb-test.c.

The new name is more appropriate as only golomb functions are tested.

7 years agoh264-test: cleanup: drop timer invocations, commented out code and other cruft
Diego Biurrun [Mon, 30 Jan 2012 10:16:20 +0000 (11:16 +0100)]
h264-test: cleanup: drop timer invocations, commented out code and other cruft

7 years agoh264-test: Remove unused DSP and AVCodec contexts and related init calls.
Diego Biurrun [Mon, 30 Jan 2012 10:10:27 +0000 (11:10 +0100)]
h264-test: Remove unused DSP and AVCodec contexts and related init calls.

This also avoids a segfault on startup.

7 years agoadpcm: Add missing stdint.h #include to fix standalone header compilation.
Diego Biurrun [Tue, 31 Jan 2012 17:41:52 +0000 (18:41 +0100)]
adpcm: Add missing stdint.h #include to fix standalone header compilation.

7 years agolavf: add functions for accessing the fourcc<->CodecID mapping tables.
Anton Khirnov [Fri, 27 Jan 2012 12:33:09 +0000 (13:33 +0100)]
lavf: add functions for accessing the fourcc<->CodecID mapping tables.

Fixes bug 212.

7 years agolavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
Anton Khirnov [Sat, 28 Jan 2012 18:15:15 +0000 (19:15 +0100)]
lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().

This way, if the AVCodecContext is allocated for a specific codec, the
caller doesn't need to store this codec separately and then pass it
again to avcodec_open2().

It also allows to set codec private options using av_opt_set_* before
opening the codec.

7 years agolavc: make avcodec_close() work properly on unopened codecs.
Anton Khirnov [Sun, 29 Jan 2012 11:17:30 +0000 (12:17 +0100)]
lavc: make avcodec_close() work properly on unopened codecs.

I.e. free the priv_data and other stuff allocated in
avcodec_alloc_context3() and not segfault.

7 years agolavc: add avcodec_is_open().
Anton Khirnov [Thu, 8 Dec 2011 05:57:44 +0000 (06:57 +0100)]
lavc: add avcodec_is_open().

It allows to check whether an AVCodecContext is open in a documented
way. Right now the undocumented way this check is done in lavf/lavc is
by checking whether AVCodecContext.codec is NULL. However it's desirable
to be able to set AVCodecContext.codec before avcodec_open2().

7 years agolavf: rename AVInputFormat.value to raw_codec_id.
Anton Khirnov [Tue, 31 Jan 2012 06:50:31 +0000 (07:50 +0100)]
lavf: rename AVInputFormat.value to raw_codec_id.

It's only used by raw demuxers for storing the codec id.

7 years agolavf: remove the pointless value field from flv and iv8
Anton Khirnov [Tue, 31 Jan 2012 06:46:18 +0000 (07:46 +0100)]
lavf: remove the pointless value field from flv and iv8

The demuxers don't use it in any way.

7 years agolavc/lavf: remove unnecessary symbols from the symbol version script.
Anton Khirnov [Sun, 29 Jan 2012 11:22:49 +0000 (12:22 +0100)]
lavc/lavf: remove unnecessary symbols from the symbol version script.

7 years agolavc: reorder AVCodec fields.
Anton Khirnov [Fri, 27 Jan 2012 11:29:37 +0000 (12:29 +0100)]
lavc: reorder AVCodec fields.

Put all private fields at the end and mark them as such so they can be
easily changed/removed.

This breaks ABI.

7 years agolavf: reorder AVInput/OutputFormat fields.
Anton Khirnov [Fri, 27 Jan 2012 11:29:37 +0000 (12:29 +0100)]
lavf: reorder AVInput/OutputFormat fields.

Put all private fields at the end and mark them as such so they can be
easily changed/removed.

This breaks ABI.

7 years agomp3dec: Fix a heap-buffer-overflow
Alex Converse [Wed, 25 Jan 2012 23:46:14 +0000 (15:46 -0800)]
mp3dec: Fix a heap-buffer-overflow

In some cases, what is left to read from ptr is smaller than EXTRABYTES.

Based on a patch by Thierry Foucu <tfoucu@gmail.com>.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agoadpcmenc: remove some unneeded casts
Justin Ruggles [Mon, 30 Jan 2012 18:34:43 +0000 (13:34 -0500)]
adpcmenc: remove some unneeded casts

7 years agoadpcmenc: use int16_t and uint8_t instead of short and unsigned char.
Justin Ruggles [Mon, 30 Jan 2012 18:33:05 +0000 (13:33 -0500)]
adpcmenc: use int16_t and uint8_t instead of short and unsigned char.

7 years agoadpcmenc: fix adpcm_ms extradata allocation
Justin Ruggles [Mon, 30 Jan 2012 18:15:18 +0000 (13:15 -0500)]
adpcmenc: fix adpcm_ms extradata allocation

Add FF_INPUT_BUFFER_PADDING_SIZE.
If allocation fails, also free memory which was allocated previously in
adpcm_encode_init().

7 years agoadpcmenc: return proper AVERROR codes instead of -1
Justin Ruggles [Mon, 30 Jan 2012 18:06:57 +0000 (13:06 -0500)]
adpcmenc: return proper AVERROR codes instead of -1

7 years agoadpcmenc: check for coded_frame allocation failure
Justin Ruggles [Mon, 30 Jan 2012 18:03:01 +0000 (13:03 -0500)]
adpcmenc: check for coded_frame allocation failure

7 years agoadpcmenc: Do not set coded_frame->key_frame.
Justin Ruggles [Mon, 30 Jan 2012 17:57:34 +0000 (12:57 -0500)]
adpcmenc: Do not set coded_frame->key_frame.

It is already set in avcodec_alloc_frame().

7 years agompc7: check for allocation failure
Justin Ruggles [Mon, 30 Jan 2012 19:33:01 +0000 (14:33 -0500)]
mpc7: check for allocation failure

7 years agompc7: align local temp buffer
Justin Ruggles [Mon, 30 Jan 2012 19:29:05 +0000 (14:29 -0500)]
mpc7: align local temp buffer

DSPContext.bswap_buf() requires aligned output

7 years agorv40: x86 SIMD for biweight
Christophe Gisquet [Wed, 11 Jan 2012 23:11:15 +0000 (00:11 +0100)]
rv40: x86 SIMD for biweight

Provide MMX, SSE2 and SSSE3 versions, with a fast-path when the weights are
multiples of 512 (which is often the case when the values round up nicely).

*_TIMER report for the 16x16 and 8x8 cases:
C:
9015 decicycles in 16, 524257 runs, 31 skips
2656 decicycles in 8, 524271 runs, 17 skips
MMX:
4156 decicycles in 16, 262090 runs, 54 skips
1206 decicycles in 8, 262131 runs, 13 skips
MMX on fast-path:
2760 decicycles in 16, 524222 runs, 66 skips
995 decicycles in 8, 524252 runs, 36 skips
SSE2:
2163 decicycles in 16, 262131 runs, 13 skips
832 decicycles in 8, 262137 runs, 7 skips
SSE2 with fast path:
1783 decicycles in 16, 524276 runs, 12 skips
711 decicycles in 8, 524283 runs, 5 skips
SSSE3:
2117 decicycles in 16, 262136 runs, 8 skips
814 decicycles in 8, 262143 runs, 1 skips
SSSE3 with fast path:
1315 decicycles in 16, 524285 runs, 3 skips
578 decicycles in 8, 524286 runs, 2 skips

This means around a 4% speedup for some sequences.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86: Give RV40 init file a more suitable name.
Diego Biurrun [Mon, 30 Jan 2012 08:56:28 +0000 (09:56 +0100)]
x86: Give RV40 init file a more suitable name.

7 years agox86: Place mm_flags variable declaration below the appropriate #ifdef.
Diego Biurrun [Mon, 30 Jan 2012 08:39:16 +0000 (09:39 +0100)]
x86: Place mm_flags variable declaration below the appropriate #ifdef.

This fixes some unused variable warnings with YASM disabled.

7 years agomovdec: Ignore sample_degradation_priority bits when checking first_sample_flags
Martin Storsjö [Wed, 18 Jan 2012 13:12:10 +0000 (15:12 +0200)]
movdec: Ignore sample_degradation_priority bits when checking first_sample_flags

This makes the first packet of a track fragment run to get
the keyframe flag set properly if sample_degradation_priority
is nonzero.

This makes the keyframes flag be set properly for ismv files
created by Microsoft.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoflvdec: Interpret a toplevel 'object' type metadata item as normal metadata, too
Martin Storsjö [Mon, 30 Jan 2012 20:47:40 +0000 (22:47 +0200)]
flvdec: Interpret a toplevel 'object' type metadata item as normal metadata, too

Previously, we've only passed the key string on to the recursive
amf_parse_object for the mixedarray type, not for 'object'. By
passing the key string on, the recursive amf_parse_object can
store the amf objects as metadata.

This kind of data was seen in data from XSplit Broadcaster, received
over RTMP via Wowza. This patch allows reading this metadata.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoavconv: deprecate the -deinterlace option
Anton Khirnov [Mon, 30 Jan 2012 15:05:28 +0000 (16:05 +0100)]
avconv: deprecate the -deinterlace option

Its quality is horrible, yadif should always be used instead.

7 years agodoc: Fix the name of the new function
Martin Storsjö [Mon, 30 Jan 2012 19:11:33 +0000 (21:11 +0200)]
doc: Fix the name of the new function

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoaacenc: make sure to encode enough frames to cover all input samples.
Justin Ruggles [Sat, 28 Jan 2012 22:51:22 +0000 (17:51 -0500)]
aacenc: make sure to encode enough frames to cover all input samples.

Currently, any samples in the final frame are not decoded because they are
only represented by one frame instead of two. So we encode two final frames to
cover both the analysis delay and the MDCT delay.

7 years agoaacenc: only use the number of input samples provided by the user.
Justin Ruggles [Sat, 28 Jan 2012 22:18:18 +0000 (17:18 -0500)]
aacenc: only use the number of input samples provided by the user.

Fixes handling of CODEC_CAP_SMALL_LAST_FRAME.

7 years agowmadec: Verify bitstream size makes sense before calling init_get_bits.
Alex Converse [Fri, 27 Jan 2012 22:24:07 +0000 (14:24 -0800)]
wmadec: Verify bitstream size makes sense before calling init_get_bits.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agokmvc: Log into a context at a log level constant.
Alex Converse [Mon, 30 Jan 2012 18:27:50 +0000 (10:27 -0800)]
kmvc: Log into a context at a log level constant.

7 years agompeg12: Pad framerate tab to 16 entries.
Alex Converse [Fri, 27 Jan 2012 23:50:24 +0000 (15:50 -0800)]
mpeg12: Pad framerate tab to 16 entries.

There are many places where we read an unchecked 4-bit index into it.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agokgv1dec: Increase offsets array size so it is large enough.
Michael Niedermayer [Wed, 25 Jan 2012 22:23:35 +0000 (23:23 +0100)]
kgv1dec: Increase offsets array size so it is large enough.

Fixes CVE-2011-3945

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 807a045ab7f51993a2c1b3116016cbbd4f3d20d6)

Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agokmvc: Check palsize.
Alex Converse [Thu, 26 Jan 2012 16:30:49 +0000 (17:30 +0100)]
kmvc: Check palsize.

Fixes: CVE-2011-3952

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Based on fix by Michael Niedermayer

7 years agonsvdec: Propagate errors
Alex Converse [Fri, 27 Jan 2012 01:23:09 +0000 (17:23 -0800)]
nsvdec: Propagate errors

Related to CVE-2011-3940.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agonsvdec: Be more careful with av_malloc().
Alex Converse [Fri, 27 Jan 2012 01:21:46 +0000 (17:21 -0800)]
nsvdec: Be more careful with av_malloc().

Check results for av_malloc() and fix an overflow in one call.

Related to CVE-2011-3940.

Based in part on work from Michael Niedermayer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
7 years agonsvdec: Fix use of uninitialized streams.
Michael Niedermayer [Tue, 24 Jan 2012 21:20:26 +0000 (22:20 +0100)]
nsvdec: Fix use of uninitialized streams.

Fixes CVE-2011-3940 (Out of bounds read resulting in out of bounds write)

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5c011706bc752d34bc6ada31d7df2ca0c9af7c6b)

Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agomovenc: cosmetics: Get rid of camelCase identifiers
Martin Storsjö [Mon, 30 Jan 2012 14:19:15 +0000 (16:19 +0200)]
movenc: cosmetics: Get rid of camelCase identifiers

Also add spacing around operators on touched lines, and split
one line to match the common style.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoswscale: more generic check for planar destination formats with alpha
Paul B Mahol [Mon, 30 Jan 2012 13:58:50 +0000 (13:58 +0000)]
swscale: more generic check for planar destination formats with alpha

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>