ffmpeg.git
6 years agolavfi: drop af_volume_stefano.c in favor of af_volume_justin.c
Stefano Sabatini [Sat, 8 Dec 2012 11:07:03 +0000 (12:07 +0100)]
lavfi: drop af_volume_stefano.c in favor of af_volume_justin.c

Justin's version has more features but is otherwise equivalent from the
point of view of the syntax.

6 years agodoc/filters: fix copy&paste error in volume_justin documentation
Stefano Sabatini [Sat, 8 Dec 2012 14:38:20 +0000 (15:38 +0100)]
doc/filters: fix copy&paste error in volume_justin documentation

Spotted by ubitux.

6 years agolavfi/volume_justin: add support to option shorthands and introspection
Stefano Sabatini [Sat, 8 Dec 2012 10:58:52 +0000 (11:58 +0100)]
lavfi/volume_justin: add support to option shorthands and introspection

6 years agolavfi/volume_justin: fix a few grammar inconsistencies in options description
Stefano Sabatini [Sat, 8 Dec 2012 10:54:43 +0000 (11:54 +0100)]
lavfi/volume_justin: fix a few grammar inconsistencies in options description

6 years agodoc: sync avoid_negative_ts option with internal help.
Clément Bœsch [Sat, 8 Dec 2012 14:17:47 +0000 (15:17 +0100)]
doc: sync avoid_negative_ts option with internal help.

6 years agoMerge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'
Michael Niedermayer [Sat, 8 Dec 2012 13:58:56 +0000 (14:58 +0100)]
Merge commit '096abfa15052977eed93f0b5e01afd2d47c53c1f'

* commit '096abfa15052977eed93f0b5e01afd2d47c53c1f':
  parser: fix large overreads
  bitstream: add get_bits64() to support reading more than 32 bits at once
  arm: detect cpu features at runtime on Linux

Conflicts:
libavcodec/parser.c
libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoget_bits: rename get_bits_longlong to get_bits64
Michael Niedermayer [Sat, 8 Dec 2012 13:39:11 +0000 (14:39 +0100)]
get_bits: rename get_bits_longlong to get_bits64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegts: rename get_bits64 to get_ts64
Michael Niedermayer [Sat, 8 Dec 2012 13:35:27 +0000 (14:35 +0100)]
mpegts: rename get_bits64 to get_ts64

Renaming because of name conflict

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b326755989b346d0d935e0628e8865f9b2951c30'
Michael Niedermayer [Sat, 8 Dec 2012 13:24:06 +0000 (14:24 +0100)]
Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30'

* commit 'b326755989b346d0d935e0628e8865f9b2951c30':
  arm: rename ARMVFP config symbol to VFP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'
Michael Niedermayer [Sat, 8 Dec 2012 13:19:55 +0000 (14:19 +0100)]
Merge commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5'

* commit '637606de2d2e0af0a9fa2f23f943765d7d7c5cd5':
  configure: arm: make _inline arch ext symbols depend on inline_asm
  arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation

Conflicts:
configure
libavcodec/arm/dca.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7f2b3dcabd108926bde819ad574017f4161d1546'
Michael Niedermayer [Sat, 8 Dec 2012 13:13:53 +0000 (14:13 +0100)]
Merge commit '7f2b3dcabd108926bde819ad574017f4161d1546'

* commit '7f2b3dcabd108926bde819ad574017f4161d1546':
  configure: arm: check inline and external asm support for extensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c6ebc9faa2210d7f36a3036c357f6f199520f575'
Michael Niedermayer [Sat, 8 Dec 2012 13:08:41 +0000 (14:08 +0100)]
Merge commit 'c6ebc9faa2210d7f36a3036c357f6f199520f575'

* commit 'c6ebc9faa2210d7f36a3036c357f6f199520f575':
  configure: add check_insn function
  configure: clean up check_inline_asm and check_as functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea'
Michael Niedermayer [Sat, 8 Dec 2012 13:04:34 +0000 (14:04 +0100)]
Merge commit 'f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea'

* commit 'f0fe245bc31cf4fa3b3ed0240cd1ab6f0d5043ea':
  configure: arm: set fast_clz and fast_unaligned in cpuflags section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1234c66a315b139339d52ca193b3f1d67af9ce19'
Michael Niedermayer [Sat, 8 Dec 2012 12:57:19 +0000 (13:57 +0100)]
Merge commit '1234c66a315b139339d52ca193b3f1d67af9ce19'

* commit '1234c66a315b139339d52ca193b3f1d67af9ce19':
  configure: arm: detect toolchain default arch version

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'
Michael Niedermayer [Sat, 8 Dec 2012 12:49:26 +0000 (13:49 +0100)]
Merge commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52'

* commit '9ebd45c2d58ad9241ad09718679f0cf7fb57da52':
  configure: do not bypass cpuflags section if --cpu not given
  dct-test: arm: indicate required cpu features for optimised funcs
  snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793
  arm: fix use of uninitialised value in ff_fft_fixed_init_arm()
  avpicture: Don't assume a valid pix fmt in avpicture_get_size

Conflicts:
libavcodec/avpicture.c
libavcodec/snow.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: improve avoid_negative_ts help text
Reimar Döffinger [Sat, 8 Dec 2012 03:44:00 +0000 (04:44 +0100)]
lavf: improve avoid_negative_ts help text

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/sendcmd: switch to filter_frame API
Stefano Sabatini [Sat, 8 Dec 2012 10:27:29 +0000 (11:27 +0100)]
lavfi/sendcmd: switch to filter_frame API

6 years agolavfi/swapuv: switch to filter_frame API
Stefano Sabatini [Sat, 8 Dec 2012 10:14:51 +0000 (11:14 +0100)]
lavfi/swapuv: switch to filter_frame API

6 years agolavc/mlpdec: reset layout when channels change.
Nicolas George [Wed, 28 Nov 2012 14:25:39 +0000 (15:25 +0100)]
lavc/mlpdec: reset layout when channels change.

Triggered by the sample for trac ticket #1726.

6 years agogifdec: port to bytestream2 API
Paul B Mahol [Wed, 5 Dec 2012 16:06:54 +0000 (16:06 +0000)]
gifdec: port to bytestream2 API

While here remove ff_lzw_cur_ptr() as it become obsolete.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoopt_list: fix vertical alignment of types
Michael Niedermayer [Sat, 8 Dec 2012 00:24:07 +0000 (01:24 +0100)]
opt_list: fix vertical alignment of types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoopt: print ranges in opt_list()
Michael Niedermayer [Sun, 25 Nov 2012 16:38:54 +0000 (17:38 +0100)]
opt: print ranges in opt_list()

The formating can and should be improved.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoopt: Add support to query ranges
Michael Niedermayer [Sun, 25 Nov 2012 16:10:09 +0000 (17:10 +0100)]
opt: Add support to query ranges

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: check dimensions for video encoders
Michael Niedermayer [Fri, 7 Dec 2012 21:57:02 +0000 (22:57 +0100)]
lavc: check dimensions for video encoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoparser: fix large overreads
Michael Niedermayer [Wed, 3 Oct 2012 14:06:23 +0000 (16:06 +0200)]
parser: fix large overreads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agobitstream: add get_bits64() to support reading more than 32 bits at once
Michael Niedermayer [Sun, 30 Sep 2012 00:39:55 +0000 (02:39 +0200)]
bitstream: add get_bits64() to support reading more than 32 bits at once

Also remove a duplicate function in the MPEG-TS demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
6 years agosws_scale: check input against NULL
Michael Niedermayer [Fri, 7 Dec 2012 20:48:27 +0000 (21:48 +0100)]
sws_scale: check input against NULL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: VobSub demuxer.
Clément Bœsch [Mon, 3 Sep 2012 00:51:00 +0000 (02:51 +0200)]
lavf: VobSub demuxer.

6 years agolavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()
Stefano Sabatini [Fri, 7 Dec 2012 18:41:41 +0000 (19:41 +0100)]
lavfi/alphaextract: consistently prefer "cur" over "in" in filter_frame()

Improve consistency/readability.

6 years agolavfi/alphaextract: access outlink properties rather than out_buf->video
Stefano Sabatini [Fri, 7 Dec 2012 18:40:21 +0000 (19:40 +0100)]
lavfi/alphaextract: access outlink properties rather than out_buf->video

Avoid one dereference, simplify.

6 years agolavfi/alphaextract: fix assignment of invalid size value to memcpy in case linesize < 0
Stefano Sabatini [Fri, 7 Dec 2012 17:51:33 +0000 (18:51 +0100)]
lavfi/alphaextract: fix assignment of invalid size value to memcpy in case linesize < 0

Fix crash, for example in the command:
ffmpeg -f image2 -vcodec pgmyuv -i tests/vsynth1/%02d.pgm \
  -vf "[in]format=yuv420p,split,alphamerge,split[o3][o4];
       [o4]vflip,alphaextract[alpha];[o3][alpha]alphamerge[out]" \
  -vcodec rawvideo -f nut md5:

6 years agolavfi/alphaextract: switch to filter_frame() API
Stefano Sabatini [Fri, 7 Dec 2012 17:46:28 +0000 (18:46 +0100)]
lavfi/alphaextract: switch to filter_frame() API

6 years agolavfi/alphaextract: drop cur_linesize = out_linesize branch in draw_slice()
Stefano Sabatini [Fri, 7 Dec 2012 17:36:58 +0000 (18:36 +0100)]
lavfi/alphaextract: drop cur_linesize = out_linesize branch in draw_slice()

The code causes uninitialized data copy, and may be actually slower than
a loop over each line in case the padding is big.

6 years agobrstm: do not return partial packets
Paul B Mahol [Fri, 7 Dec 2012 17:52:23 +0000 (17:52 +0000)]
brstm: do not return partial packets

Such packets are useless.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoarm: rename ARMVFP config symbol to VFP
Mans Rullgard [Tue, 4 Dec 2012 23:29:34 +0000 (23:29 +0000)]
arm: rename ARMVFP config symbol to VFP

This is consistent with usual ARM nomenclature as well as with the
VFPV3 and NEON symbols which both lack the ARM prefix.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoarm: detect cpu features at runtime on Linux
Mans Rullgard [Wed, 5 Dec 2012 02:11:22 +0000 (02:11 +0000)]
arm: detect cpu features at runtime on Linux

This allows compiling optimised functions for features not enabled
in the core build and selecting these at runtime if the system has
the necessary support.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: arm: make _inline arch ext symbols depend on inline_asm
Mans Rullgard [Mon, 3 Dec 2012 01:36:49 +0000 (01:36 +0000)]
configure: arm: make _inline arch ext symbols depend on inline_asm

This makes --disable-inline-asm work as expected.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: arm: check inline and external asm support for extensions
Mans Rullgard [Sat, 1 Dec 2012 15:19:10 +0000 (15:19 +0000)]
configure: arm: check inline and external asm support for extensions

This tests instruction set support in both inline and external asm.
If both fail, the base config option is disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: add check_insn function
Mans Rullgard [Sat, 1 Dec 2012 15:06:56 +0000 (15:06 +0000)]
configure: add check_insn function

The check_insn function tests an instruction in both inline asm and
standalone assembly, and sets _external/_inline config properties
accordingly.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: arm: set fast_clz and fast_unaligned in cpuflags section
Mans Rullgard [Mon, 3 Dec 2012 21:47:17 +0000 (21:47 +0000)]
configure: arm: set fast_clz and fast_unaligned in cpuflags section

These are properties of the targeted core and do not depend on
specific assembly support in the toolchain which if missing will
render the controlling options here disabled.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: arm: detect toolchain default arch version
Mans Rullgard [Fri, 30 Nov 2012 21:14:25 +0000 (21:14 +0000)]
configure: arm: detect toolchain default arch version

Probe for the toolchain default architecture version if no --cpu flag
is present or an unknown cpu is specified.  Works with gcc, clang and
armcc.

This allows configuring based on the arch version even if it is not
explicitly specified to configure.  It also causes an explicit -march
flag to be added to CFLAGS and ASFLAGS, which in turn lets us do
proper instruction set tests with the assembler.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: do not bypass cpuflags section if --cpu not given
Mans Rullgard [Mon, 3 Dec 2012 19:21:42 +0000 (19:21 +0000)]
configure: do not bypass cpuflags section if --cpu not given

This will allow arch-specific ways of determining the target
variant when none is specified on the command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoarm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation
Mans Rullgard [Sat, 1 Dec 2012 16:41:39 +0000 (16:41 +0000)]
arm: use HAVE*_INLINE/EXTERNAL macros for conditional compilation

These macros reflect the actual capabilities required here.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoconfigure: clean up check_inline_asm and check_as functions
Mans Rullgard [Sat, 1 Dec 2012 13:19:05 +0000 (13:19 +0000)]
configure: clean up check_inline_asm and check_as functions

The check_inline_asm function should check the actual C compiler,
not the one used for assembly files.  Usually these are the same,
but they might be different, typically when using a compiler other
than gcc.

The check_as should, as its name suggests, test the type of input
the AS command is used with, i.e. a standalond assembly (.S) file.

Finally, check for gnu assembler using the modified check_as as
this reflects actual usage.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodct-test: arm: indicate required cpu features for optimised funcs
Mans Rullgard [Sat, 1 Dec 2012 23:08:41 +0000 (23:08 +0000)]
dct-test: arm: indicate required cpu features for optimised funcs

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agosnow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793
Anton Khirnov [Wed, 5 Dec 2012 05:34:02 +0000 (06:34 +0100)]
snow: fix build after 594d4d5df3c70404168701dd5c90b7e6e5587793

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 7 Dec 2012 15:29:07 +0000 (16:29 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: add a pointer for weighted prediction temporary buffer

Conflicts:
libavcodec/h264.c
libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/takdec: s/get_b/get_bits_esc4
Paul B Mahol [Fri, 7 Dec 2012 15:17:15 +0000 (15:17 +0000)]
lavc/takdec: s/get_b/get_bits_esc4

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavcodec: Fix a typo in an option description
Martin Storsjö [Fri, 7 Dec 2012 15:15:37 +0000 (16:15 +0100)]
avcodec: Fix a typo in an option description

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
6 years agolavc/takdec: simplify code
Paul B Mahol [Fri, 7 Dec 2012 14:56:22 +0000 (14:56 +0000)]
lavc/takdec: simplify code

Merge get_scale/get_shift into set_sample_rate_params().
Rename tak_set_bps to set_bps_params and remove 2nd argument.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'
Michael Niedermayer [Fri, 7 Dec 2012 14:45:25 +0000 (15:45 +0100)]
Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'

* commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333':
  h264: check sps.log2_max_frame_num for validity
  mov: validate number of DataReferenceBox entries against box size
  mov: compute avg_frame_rate only if duration is known
  flac: change minimum and default of lpc_passes option to 1

Conflicts:
libavcodec/h264_ps.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'
Michael Niedermayer [Fri, 7 Dec 2012 14:21:41 +0000 (15:21 +0100)]
Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'

* commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152':
  fate: dpcm: Add dependencies
  SBR DSP x86: implement SSE sbr_hf_gen
  AAC SBR: use AVFloatDSPContext's vector_fmul
  fate: image: Add dependencies
  Changelog: add an entry for deprecating the avconv -vol option
  x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32

Conflicts:
Changelog
libavutil/x86/float_dsp.asm
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: fix use of uninitialised value in ff_fft_fixed_init_arm()
Mans Rullgard [Thu, 6 Dec 2012 23:51:01 +0000 (23:51 +0000)]
arm: fix use of uninitialised value in ff_fft_fixed_init_arm()

When initialising an FFTContext for a plain FFT, mdct_bits is not set
and can contain a garbage value.  Since nbits is always valid and for
MDCT operation is mdct_bits - 2 checking this instead avoids using an
uninitialised value while having the same effect.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agolavf/pcm: check size, do not produce invalid packets
Paul B Mahol [Fri, 7 Dec 2012 13:05:43 +0000 (13:05 +0000)]
lavf/pcm: check size, do not produce invalid packets

Inspired by 92b8c9d89e7ae86bffa05393bb230d5a165b0148.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodiracdec: check dimensions against chroma format.
Michael Niedermayer [Fri, 7 Dec 2012 03:25:17 +0000 (04:25 +0100)]
diracdec: check dimensions against chroma format.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavpicture: Don't assume a valid pix fmt in avpicture_get_size
Martin Storsjö [Thu, 6 Dec 2012 21:42:36 +0000 (23:42 +0200)]
avpicture: Don't assume a valid pix fmt in avpicture_get_size

When called from the v4l2 input device, pix_fmt can be
AV_PIX_FMT_NONE (for jpeg formats). Before 50ba57e0, this wasn't
an issue for avpicture_get_size, but after that commit, this
lead to crashes.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoh264: add a pointer for weighted prediction temporary buffer
Janne Grunau [Tue, 27 Nov 2012 18:12:45 +0000 (19:12 +0100)]
h264: add a pointer for weighted prediction temporary buffer

Reusing MpegEncContext's obmc_scratchpad for this becomes a mess with
adaptive frame-mt.

6 years agoh264: check sps.log2_max_frame_num for validity
Janne Grunau [Sun, 25 Nov 2012 11:56:04 +0000 (12:56 +0100)]
h264: check sps.log2_max_frame_num for validity

Fixes infinite or long taking loop in frame num gap code in
the fuzzed sample bipbop234.ts_s223302.

CC: libav-stable@libav.org
6 years agomov: validate number of DataReferenceBox entries against box size
Janne Grunau [Mon, 26 Nov 2012 21:18:31 +0000 (22:18 +0100)]
mov: validate number of DataReferenceBox entries against box size

Avoids a 2G memory allocation and parsing of random data in
mov_read_dref(). The fuzzed sample sample.mp4_s224424 triggers this.

6 years agomov: compute avg_frame_rate only if duration is known
Janne Grunau [Fri, 23 Nov 2012 15:33:36 +0000 (16:33 +0100)]
mov: compute avg_frame_rate only if duration is known

Fixes an assert in fuzzed sample sample.mp4_s265930.

6 years agoflac: change minimum and default of lpc_passes option to 1
Janne Grunau [Fri, 7 Dec 2012 00:21:06 +0000 (01:21 +0100)]
flac: change minimum and default of lpc_passes option to 1

Avoid use of uninitialized and uncomputed linear least square models
during ff_lpc_calc_coefs() for FF_LPC_TYPE_CHOLESKY. Fixes running
make fate-flac-16-lpc-cholesk with valgrind --undef-value-errors=yes.

6 years agofate: dpcm: Add dependencies
Diego Biurrun [Wed, 28 Nov 2012 18:34:17 +0000 (19:34 +0100)]
fate: dpcm: Add dependencies

6 years agoSBR DSP x86: implement SSE sbr_hf_gen
Christophe Gisquet [Fri, 24 Feb 2012 21:11:19 +0000 (22:11 +0100)]
SBR DSP x86: implement SSE sbr_hf_gen

Start and end index are multiple of 2, therefore guaranteeing aligned access.
Also, this allows to generate 4 floats per loop, keeping the alignment all
along.

Timing:
- 32 bits: 326c -> 172c
- 64 bits: 323c -> 156c

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoAAC SBR: use AVFloatDSPContext's vector_fmul
Christophe Gisquet [Fri, 30 Nov 2012 20:49:33 +0000 (21:49 +0100)]
AAC SBR: use AVFloatDSPContext's vector_fmul

Around 5% speedup on the code block using 'vector_fmul_add's.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agofate: image: Add dependencies
Diego Biurrun [Wed, 28 Nov 2012 18:33:19 +0000 (19:33 +0100)]
fate: image: Add dependencies

6 years agodiracdec: fix typo in mctmp allocation
Michael Niedermayer [Thu, 6 Dec 2012 23:43:40 +0000 (00:43 +0100)]
diracdec: fix typo in mctmp allocation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodiracdec: Test mctmp and mcscratch for malloc failure.
Michael Niedermayer [Thu, 6 Dec 2012 23:42:44 +0000 (00:42 +0100)]
diracdec: Test mctmp and mcscratch for malloc failure.

Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodiracdec: fix emulated_edge condition, fix out of array reads
Michael Niedermayer [Thu, 6 Dec 2012 23:27:08 +0000 (00:27 +0100)]
diracdec: fix emulated_edge condition, fix out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotakdec: use samplefmt.h from libavutil
Paul B Mahol [Fri, 7 Dec 2012 01:11:55 +0000 (01:11 +0000)]
takdec: use samplefmt.h from libavutil

Instead of having own code for calculating decoded buffer size
just use already provided functions from libavutil.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoadd missing dependency for tak demuxer
Paul B Mahol [Fri, 7 Dec 2012 00:14:33 +0000 (00:14 +0000)]
add missing dependency for tak demuxer

6 years agotakdec: remove get_code() and use get_sbits() directly
Paul B Mahol [Fri, 7 Dec 2012 00:03:47 +0000 (00:03 +0000)]
takdec: remove get_code() and use get_sbits() directly

As found by Justin, this is probably bug in reference decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoFix compilation with yasm 0.6.2.
Carl Eugen Hoyos [Thu, 6 Dec 2012 23:26:45 +0000 (00:26 +0100)]
Fix compilation with yasm 0.6.2.

6 years agofix tipo
Michael Niedermayer [Thu, 6 Dec 2012 21:21:52 +0000 (22:21 +0100)]
fix tipo

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/tinterlace: drop redundant NULL checks in uninit()
Stefano Sabatini [Thu, 6 Dec 2012 21:18:24 +0000 (22:18 +0100)]
lavfi/tinterlace: drop redundant NULL checks in uninit()

6 years agolavfi/tinterlace: add support to option parsing
Stefano Sabatini [Thu, 6 Dec 2012 21:03:02 +0000 (22:03 +0100)]
lavfi/tinterlace: add support to option parsing

Simplify code, and provide introspection through the AVOption system.

6 years agolavfi/tinterlace: switch to filter_frame API
Stefano Sabatini [Thu, 6 Dec 2012 13:40:36 +0000 (14:40 +0100)]
lavfi/tinterlace: switch to filter_frame API

Also add missing NULL checks.

6 years agolavf: improve help text for avoid_negative_ts
Michael Niedermayer [Thu, 6 Dec 2012 21:05:44 +0000 (22:05 +0100)]
lavf: improve help text for avoid_negative_ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobitstream: make vlc init of static tables thread safe.
Michael Niedermayer [Thu, 6 Dec 2012 20:45:26 +0000 (21:45 +0100)]
bitstream: make vlc init of static tables thread safe.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/mp: switch to ff_filter_frame.
Clément Bœsch [Sun, 2 Dec 2012 20:15:48 +0000 (21:15 +0100)]
lavfi/mp: switch to ff_filter_frame.

6 years agodxa: port to bytestream2 API
Paul B Mahol [Thu, 6 Dec 2012 18:38:07 +0000 (18:38 +0000)]
dxa: port to bytestream2 API

Protects against overreads in input buffer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosmacker: use meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 18:06:52 +0000 (18:06 +0000)]
smacker: use meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosiff: return meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 18:00:37 +0000 (18:00 +0000)]
siff: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavf/apedec: return meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 17:17:49 +0000 (17:17 +0000)]
lavf/apedec: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agohuffyuv: return meaningful error codes
Paul B Mahol [Thu, 6 Dec 2012 16:56:40 +0000 (16:56 +0000)]
huffyuv: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agohuffyuv: check for malloc failures
Paul B Mahol [Thu, 6 Dec 2012 16:44:43 +0000 (16:44 +0000)]
huffyuv: check for malloc failures

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoChangelog: add an entry for deprecating the avconv -vol option
Justin Ruggles [Wed, 5 Dec 2012 18:03:08 +0000 (13:03 -0500)]
Changelog: add an entry for deprecating the avconv -vol option

6 years agohuffyuv: make use of av_fast_padded_malloc()
Paul B Mahol [Thu, 6 Dec 2012 16:31:54 +0000 (16:31 +0000)]
huffyuv: make use of av_fast_padded_malloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/deshake: small align prettifying.
Clément Bœsch [Thu, 6 Dec 2012 15:16:42 +0000 (16:16 +0100)]
lavfi/deshake: small align prettifying.

6 years agolavfi/deshake: switch inverted comments.
Clément Bœsch [Thu, 6 Dec 2012 15:15:03 +0000 (16:15 +0100)]
lavfi/deshake: switch inverted comments.

6 years agolavfi/deshake: remove unecessary check before unref.
Clément Bœsch [Thu, 6 Dec 2012 15:14:38 +0000 (16:14 +0100)]
lavfi/deshake: remove unecessary check before unref.

6 years agolavfi/deshake: switch to filter_frame.
Clément Bœsch [Thu, 6 Dec 2012 15:14:22 +0000 (16:14 +0100)]
lavfi/deshake: switch to filter_frame.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Dec 2012 15:03:13 +0000 (16:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: slice-mt: check master context for valid current_picture_ptr
  h264: slice-mt: get last_pic_dropable from master context
  alacenc: add support for multi-channel encoding

Conflicts:
Changelog
libavcodec/alac.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'
Michael Niedermayer [Thu, 6 Dec 2012 14:43:34 +0000 (15:43 +0100)]
Merge commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56'

* commit 'b519298a1578e0c895d53d4b4ed8867b1c031a56':
  pixdesc: fix yuva 10bit bit depth
  avconv: deprecate the -vol option
  x86: af_volume: add SSE2/SSSE3/AVX-optimized s32 volume scaling
  x86: af_volume: add SSE2-optimized s16 volume scaling

Conflicts:
ffmpeg.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: rename af_volume to af_volume_stefano
Michael Niedermayer [Thu, 6 Dec 2012 14:29:23 +0000 (15:29 +0100)]
lavfi: rename af_volume to af_volume_stefano

This matches the naming style of the new af_volume_justin filter.

Note, Yes i would too prefer having one filter instead of 2.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b384e031daeb1ac612620985e3e5377bc587559c'
Michael Niedermayer [Thu, 6 Dec 2012 14:18:59 +0000 (15:18 +0100)]
Merge commit 'b384e031daeb1ac612620985e3e5377bc587559c'

* commit 'b384e031daeb1ac612620985e3e5377bc587559c':
  lavfi: add volume filter

Conflicts:
Changelog
libavfilter/Makefile
libavfilter/af_volume.c
libavfilter/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/lavfi: fix float.h include.
Clément Bœsch [Thu, 6 Dec 2012 14:09:47 +0000 (15:09 +0100)]
lavd/lavfi: fix float.h include.

float.h is a system header.

6 years agolavfi/silencedetect: use eval builtin to parse dB.
Clément Bœsch [Thu, 6 Dec 2012 14:08:38 +0000 (15:08 +0100)]
lavfi/silencedetect: use eval builtin to parse dB.

Also update FATE test to use the dB form.

6 years agoMerge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'
Michael Niedermayer [Thu, 6 Dec 2012 13:33:38 +0000 (14:33 +0100)]
Merge commit '9d5c62ba5b586c80af508b5914934b1c439f6652'

* commit '9d5c62ba5b586c80af508b5914934b1c439f6652':
  lavu/opt: do not filter out the initial sign character except for flags
  eval: treat dB as decibels instead of decibytes
  float_dsp: add vector_dmul_scalar() to multiply a vector of doubles

Conflicts:
libavutil/eval.c
tests/ref/fate/eval

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32
Justin Ruggles [Wed, 5 Dec 2012 16:53:21 +0000 (16:53 +0000)]
x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agolavf: add a concat demuxer.
Nicolas George [Wed, 22 Aug 2012 16:28:37 +0000 (18:28 +0200)]
lavf: add a concat demuxer.