ffmpeg.git
6 years agoFix compilation with --disable-everything --enable-encoder=flac.
Carl Eugen Hoyos [Sat, 8 Feb 2014 11:06:49 +0000 (12:06 +0100)]
Fix compilation with --disable-everything --enable-encoder=flac.

6 years agovp9: fix mix-up of last-frame/cur-frame in frame size checks.
Ronald S. Bultje [Sat, 8 Feb 2014 01:14:38 +0000 (20:14 -0500)]
vp9: fix mix-up of last-frame/cur-frame in frame size checks.

Fixes invalid reads in fuzzed7.ivf.

6 years agox86/vp9lpf: simplify 2nd transpose in 44/48/88/84.
Clément Bœsch [Sat, 8 Feb 2014 10:09:30 +0000 (11:09 +0100)]
x86/vp9lpf: simplify 2nd transpose in 44/48/88/84.

For non-avx optims, this saves 8 movs.

before:
  1785 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524129 runs, 159 skips
  3327 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262116 runs, 28 skips
  2712 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193729 runs, 575 skips
  3237 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524061 runs, 227 skips

after:
  1768 decicycles in ff_vp9_loop_filter_h_44_16_ssse3, 524062 runs, 226 skips
  3310 decicycles in ff_vp9_loop_filter_h_48_16_ssse3, 262107 runs, 37 skips
  2719 decicycles in ff_vp9_loop_filter_h_88_16_ssse3, 4193954 runs, 350 skips
  3184 decicycles in ff_vp9_loop_filter_h_84_16_ssse3, 524236 runs, 52 skips

6 years agoffserver: drop unneeded delay1 var
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 03:19:39 +0000 (00:19 -0300)]
ffserver: drop unneeded delay1 var

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: move misplaced comment
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 01:02:26 +0000 (22:02 -0300)]
ffserver: move misplaced comment

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: drop obvious comment
Reynaldo H. Verdejo Pinochet [Sat, 8 Feb 2014 01:00:07 +0000 (22:00 -0300)]
ffserver: drop obvious comment

Following code line is self explanatory

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoffserver: cosmetics and grammar
Reynaldo H. Verdejo Pinochet [Fri, 7 Feb 2014 22:54:56 +0000 (19:54 -0300)]
ffserver: cosmetics and grammar

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agolavc/mpegvideo: add missing const
Lukasz Marek [Fri, 7 Feb 2014 15:43:10 +0000 (16:43 +0100)]
lavc/mpegvideo: add missing const

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc/jpeg2000dec: silent warning discards qualifiers
Lukasz Marek [Fri, 7 Feb 2014 15:25:33 +0000 (16:25 +0100)]
lavc/jpeg2000dec: silent warning discards qualifiers

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 8 Feb 2014 01:16:47 +0000 (02:16 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dcadsp: split lfe_dir cases

Conflicts:
libavcodec/arm/dcadsp_init_arm.c

See: 45854df9a5220bdde400a447f63f61618b89dde2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadsp: split lfe_dir cases
Christophe Gisquet [Thu, 6 Feb 2014 00:41:54 +0000 (00:41 +0000)]
dcadsp: split lfe_dir cases

The x86 runs short on registers because numerous elements are not static.
In addition, splitting them allows more optimized code, at least for x86.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5b59a9fc6152169599561f04b4f66370edda5c9c'
Michael Niedermayer [Sat, 8 Feb 2014 00:11:50 +0000 (01:11 +0100)]
Merge commit '5b59a9fc6152169599561f04b4f66370edda5c9c'

* commit '5b59a9fc6152169599561f04b4f66370edda5c9c':
  x86: dcadsp: implement int8x8_fmul_int32

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2bd44cb705340c4f7bd7e459a1efed5074bf45fc'
Michael Niedermayer [Fri, 7 Feb 2014 23:55:37 +0000 (00:55 +0100)]
Merge commit '2bd44cb705340c4f7bd7e459a1efed5074bf45fc'

* commit '2bd44cb705340c4f7bd7e459a1efed5074bf45fc':
  dcadsp: add int8x8_fmul_int32 to dsp context

See: 481a46a462ca762600ee4ad4c3b1e93d21b1fa35
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadsp: add int8x8_fmul_int32 to DSP context
Christophe Gisquet [Fri, 11 May 2012 09:17:36 +0000 (11:17 +0200)]
dcadsp: add int8x8_fmul_int32 to DSP context

It is currently declared as a macro who is set to inlinable functions,
among which a Neon and a default C implementations.

Add a DSP parameter to each inline function, unused except by the
default C implementation which calls a function from the DSP context.

On an Arrandale CPU, gain for an inlined SSE2 function vs. a call:
- Win32: 29 to 26 cycles
- Win64: 25 to 23 cycles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635'
Michael Niedermayer [Fri, 7 Feb 2014 23:49:11 +0000 (00:49 +0100)]
Merge commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635'

* commit 'e3fec3f095ab5ea08ee662942d98526aaf5e3635':
  arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5bcbb516f2ff45290ef7995b081762e668693672'
Michael Niedermayer [Fri, 7 Feb 2014 23:29:45 +0000 (00:29 +0100)]
Merge commit '5bcbb516f2ff45290ef7995b081762e668693672'

* commit '5bcbb516f2ff45290ef7995b081762e668693672':
  arm: Add X() around all references to extern symbols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: Simplify get_qPy_pred()
Michael Niedermayer [Fri, 7 Feb 2014 22:28:22 +0000 (23:28 +0100)]
avcodec/hevc: Simplify get_qPy_pred()

Fixes use of uninitialized memory
Fixes: 93728afd9aa074ba14a09bfd93a632fd-asan_static-oob_124a17d_1445_cov_1021181966_DBLK_D_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: make check for previous slice segment tighter
Michael Niedermayer [Fri, 7 Feb 2014 15:31:11 +0000 (16:31 +0100)]
avcodec/hevc: make check for previous slice segment tighter

This ensures the previous one is matching the curent and not just any

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodcadsp: split lfe_dir cases
Christophe Gisquet [Wed, 5 Feb 2014 23:40:52 +0000 (23:40 +0000)]
dcadsp: split lfe_dir cases

The x86 runs short on registers because numerous elements are not static.
In addition, splitting them allows more optimized code, at least for x86.

Arm asm changes by Janne Grunau.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agox86: dcadsp: implement int8x8_fmul_int32
Christophe Gisquet [Fri, 11 May 2012 09:25:30 +0000 (11:25 +0200)]
x86: dcadsp: implement int8x8_fmul_int32

For the callable function (as opposed to the inline one):
         C  SSE  SSE2  SSE4
Win32:  47   42   29    26
Win64:  30   33   25    23
The SSE version is neither compiled nor set for ARCH_X86_64, as the
inlinable function takes over.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agodcadsp: add int8x8_fmul_int32 to dsp context
Christophe Gisquet [Fri, 11 May 2012 09:17:36 +0000 (11:17 +0200)]
dcadsp: add int8x8_fmul_int32 to dsp context

It is currently declared as a macro who is set to inlinable functions,
among which a Neon and a default C implementations.

Add a DSP parameter to each inline function, unused except by the
default C implementation which calls a function from the DSP context.

On an Arrandale CPU, gain for an inlined SSE2 function vs. a call:
- Win32: 29 to 26 cycles
- Win64: 25 to 23 cycles

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agolavc/adpcm_data: fix const misplacement
Lukasz Marek [Fri, 7 Feb 2014 15:42:17 +0000 (16:42 +0100)]
lavc/adpcm_data: fix const misplacement

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavc/evrcdec: fix const misplacement
Lukasz Marek [Fri, 7 Feb 2014 15:38:59 +0000 (16:38 +0100)]
lavc/evrcdec: fix const misplacement

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoavcodec/wmalosslessdec: fix mclms_coeffs* array size
Michael Niedermayer [Fri, 7 Feb 2014 14:07:23 +0000 (15:07 +0100)]
avcodec/wmalosslessdec: fix mclms_coeffs* array size

Fixes corruption of context
Fixes: 8835659dde6a4f7dcdf341de6a45c6c8-signal_sigsegv_1dce67b_4564_cov_2504444599_classical_22_16_1_14000_v3c_0_extend_0_29.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/wmalosslessdec: use sizeof() instead of literal number
Michael Niedermayer [Fri, 7 Feb 2014 14:04:26 +0000 (15:04 +0100)]
avcodec/wmalosslessdec: use sizeof() instead of literal number

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: Add EXTERN_ASM to the .func and .type declarations for exported symbols
Martin Storsjö [Tue, 4 Feb 2014 14:28:24 +0000 (16:28 +0200)]
arm: Add EXTERN_ASM to the .func and .type declarations for exported symbols

This makes the generated assembly more internally consistent,
avoiding declaring two labels for the same function (for cases
where EXTERN_ASM is empty) and not declaring a separate unprefixed
label in other cases.

This also makes sure the .func and .type delcarations have the same
prefix. They have previously not been used on the platforms
that have prefixed symbols on arm (iOS), but gas-preprocessor
has recently started using the .func declarations for adding
.thumb_func declarations for such functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoarm: Add X() around all references to extern symbols
Martin Storsjö [Fri, 7 Feb 2014 10:00:31 +0000 (12:00 +0200)]
arm: Add X() around all references to extern symbols

Don't rely on the fact that an unprefixed label currently exists.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoFix a few heigth/height typo.
Clément Bœsch [Fri, 7 Feb 2014 08:33:56 +0000 (09:33 +0100)]
Fix a few heigth/height typo.

6 years agoavcodec/hevc: hls_decode_entry: check that the previous slice segment is available...
Michael Niedermayer [Fri, 7 Feb 2014 03:32:28 +0000 (04:32 +0100)]
avcodec/hevc: hls_decode_entry: check that the previous slice segment is available before decoding the next

Fixes use of uninitialized memory
Fixes out of array read
Fixes assertion failure
Fixes part of cb307d24befbd109c6f054008d6777b5/asan_static-oob_124a175_1445_cov_2355279992_DBLK_D_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: clear tab_slice_address of ctb on error.
Michael Niedermayer [Fri, 7 Feb 2014 03:30:31 +0000 (04:30 +0100)]
avcodec/hevc: clear tab_slice_address of ctb on error.

This allows us to detect which areas have failed to decode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc: clear tab_slice_address in hevc_frame_start()
Michael Niedermayer [Fri, 7 Feb 2014 01:37:18 +0000 (02:37 +0100)]
avcodec/hevc: clear tab_slice_address in hevc_frame_start()

Fixes inconsistencies
Fixes use of uninitilaized memory
Fixes part of  cb307d24befbd109c6f054008d6777b5/asan_static-oob_124a175_1445_cov_2355279992_DBLK_D_VIXS_1.bit
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/hevc_filter: assert validity of qp predictor input
Michael Niedermayer [Fri, 7 Feb 2014 00:55:17 +0000 (01:55 +0100)]
avcodec/hevc_filter: assert validity of qp predictor input

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Feb 2014 23:57:27 +0000 (00:57 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp8: fix bilinear C code to work if src_stride != dst_stride.

See: 34b429d5ba7b823748e897f0295aa78aaa2ebb9d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/cpu: add missing avx2 AVOption in av_parse_cpu_flags()
James Almer [Thu, 6 Feb 2014 04:34:01 +0000 (01:34 -0300)]
x86/cpu: add missing avx2 AVOption in av_parse_cpu_flags()

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp8: fix bilinear C code to work if src_stride != dst_stride.
Ronald S. Bultje [Wed, 5 Feb 2014 07:59:45 +0000 (07:59 +0000)]
vp8: fix bilinear C code to work if src_stride != dst_stride.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agoconfigure: Remove dcbzl check for e500v1 and e500v2 architectures
Peter Krefting [Thu, 6 Feb 2014 11:51:39 +0000 (12:51 +0100)]
configure: Remove dcbzl check for e500v1 and e500v2 architectures

The DCBZL instruction is not available for the e500v1 and e500v2
architectures, but may still be recognized by the toolchain, so we need to
remove the test for it explicitly for these architectures.

References: PowerPC™ e500 Core Family Reference Manual (Freescale)

Found-by: Ståle Kristoffersen <staalebk@ifi.uio.no>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/texi2pod: make references bold
Timothy Gu [Sun, 26 Jan 2014 17:43:20 +0000 (09:43 -0800)]
doc/texi2pod: make references bold

Inspired by GCC r86635.

This is more consistent with other man pages. For example in `man git`,
all the "git-help(1)" kind of cross refs are bold.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Feb 2014 14:33:54 +0000 (15:33 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vp8: Use 2 registers for dst_stride and src_stride in neon bilin filter

Conflicts:
libavcodec/arm/vp8dsp_neon.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp8: Use 2 registers for dst_stride and src_stride in neon bilin filter
Martin Storsjö [Wed, 5 Feb 2014 12:47:32 +0000 (14:47 +0200)]
vp8: Use 2 registers for dst_stride and src_stride in neon bilin filter

Based on a patch by Ronald S. Bultje.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoflac/x86: add ff_flac_lpc_32_sse4()
Loren Merritt [Mon, 3 Feb 2014 23:17:04 +0000 (23:17 +0000)]
flac/x86: add ff_flac_lpc_32_sse4()

benchmarked on sandybridge x86_64:
1358232 decicycles in flac_lpc_32_c
1244575 decicycles in flac_lpc_32_sse4, James Almer's patch
 650045 decicycles in flac_lpc_32_sse4, this patch

I haven't tested the edgecases such as odd block lengths

odd block length tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibfdk-aacenc: disable hard version requirements
Timothy Gu [Thu, 6 Feb 2014 00:08:00 +0000 (16:08 -0800)]
libfdk-aacenc: disable hard version requirements

Enable compilation on machines with an old libfdk-aac.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Feb 2014 23:26:18 +0000 (00:26 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: force the simple idct for xvid custom matrix test

Conflicts:
tests/fate/xvid.mak
tests/ref/fate/xvid-custom-matrix

See: ef034cbf185e1938000a117bd16aa6b33046f479
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'
Michael Niedermayer [Wed, 5 Feb 2014 22:48:15 +0000 (23:48 +0100)]
Merge commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64'

* commit 'a1e1f35203bbcbea0efb51d93e96769c826b8c64':
  lavu: add missing log.h include in timer.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbis: extract metadata from the middle of a stream
Ben Boeckel [Wed, 5 Feb 2014 17:10:56 +0000 (12:10 -0500)]
vorbis: extract metadata from the middle of a stream

If a special comment packet shows up in the middle of the stream, we
should extract it out into the vorbis stream metadata dictionary.

Also, if there is metadata in the packet on the way in, it might linger
since we only add data to the dictionary causing stale metadata to be
inserted into the stream. Instead, clear it to remove any doubt about
what is new and old.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovorbis: append data from tags together
Ben Boeckel [Wed, 5 Feb 2014 17:10:55 +0000 (12:10 -0500)]
vorbis: append data from tags together

Currently, if there are multiple 'performer' tags, the last one is the
only one which appears. Instead, join them with a semicolon.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoogg: allow streams to update metadata
Ben Boeckel [Wed, 5 Feb 2014 17:10:54 +0000 (12:10 -0500)]
ogg: allow streams to update metadata

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/oggparseopus: Setting seek_preroll in AVCodecContext
Vignesh Venkatasubramanian [Wed, 5 Feb 2014 15:36:13 +0000 (07:36 -0800)]
lavf/oggparseopus: Setting seek_preroll in AVCodecContext

Setting seek_preroll value in AVCodecContext for Opus streams
embedded in ogg container.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: force the simple idct for xvid custom matrix test
Janne Grunau [Fri, 31 Jan 2014 11:52:07 +0000 (12:52 +0100)]
fate: force the simple idct for xvid custom matrix test

The original test without a forced idct is still useful since it tests
the switching of the idct algorithm/permutation on x86 with MMX. MMXext
or SSE2. Make sure the test runs only if MMX inline asm is available and
force -cpuflags to all.
Add the required bitexact flag for both tests.

6 years agolavu: add missing log.h include in timer.h
Janne Grunau [Wed, 5 Feb 2014 16:52:35 +0000 (17:52 +0100)]
lavu: add missing log.h include in timer.h

6 years agoconfigure: use real libfdk-aac version instead of API version in help text
Timothy Gu [Wed, 5 Feb 2014 04:01:16 +0000 (20:01 -0800)]
configure: use real libfdk-aac version instead of API version in help text

Also use real name with a '-' instead of '_'.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Wed, 5 Feb 2014 13:12:46 +0000 (14:12 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: flush subtitle codecs as well with null packets
  ffplay: reorder the filters to ensure that inputs of the custom filters are merged first

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86/vp9lpf: remove 8 SWAPs in 84/48 transpose.
Clément Bœsch [Wed, 5 Feb 2014 06:21:13 +0000 (07:21 +0100)]
x86/vp9lpf: remove 8 SWAPs in 84/48 transpose.

6 years agox86/vp9lpf: remove braindead double pxor.
Clément Bœsch [Wed, 5 Feb 2014 06:21:11 +0000 (07:21 +0100)]
x86/vp9lpf: remove braindead double pxor.

6 years agox86/vp9lpf: save a few mov in flat8in/hev masks calc.
Clément Bœsch [Wed, 5 Feb 2014 06:21:09 +0000 (07:21 +0100)]
x86/vp9lpf: save a few mov in flat8in/hev masks calc.

6 years agox86/vp9lpf: add ff_vp9_loop_filter_[vh]_44_16_{sse2,ssse3,avx}.
Clément Bœsch [Wed, 5 Feb 2014 06:21:06 +0000 (07:21 +0100)]
x86/vp9lpf: add ff_vp9_loop_filter_[vh]_44_16_{sse2,ssse3,avx}.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Feb 2014 02:59:37 +0000 (03:59 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg: K&R formatting cosmetics

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'
Michael Niedermayer [Wed, 5 Feb 2014 02:25:52 +0000 (03:25 +0100)]
Merge commit '9ecb858775483a76c137e8e1ad45a95e318bca61'

* commit '9ecb858775483a76c137e8e1ad45a95e318bca61':
  doxy: Format @code blocks so they render properly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'
Michael Niedermayer [Wed, 5 Feb 2014 02:17:16 +0000 (03:17 +0100)]
Merge commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931'

* commit 'd9ae1031f5edbd25c8526b4cb51aba66d3bee931':
  lavf: improve handling of sparse streams when muxing

Conflicts:
doc/APIchanges
libavformat/avformat.h
libavformat/mux.c
libavformat/options_table.h
libavformat/version.h

See: 37ed5df5c5e06a55724fb9eb215da1594b648282
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'
Michael Niedermayer [Wed, 5 Feb 2014 01:46:45 +0000 (02:46 +0100)]
Merge commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b'

* commit '4c3e1956ee35fdcc5ffdb28782050164b4623c0b':
  lagarith: reallocate rgb_planes when needed

Conflicts:
libavcodec/lagarith.c

See: 9eef41b848939a0a86582afdb45235e41612d9ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'
Michael Niedermayer [Wed, 5 Feb 2014 01:16:20 +0000 (02:16 +0100)]
Merge commit '2240e2078d53d3cfce8ff1dda64e58fa72038602'

* commit '2240e2078d53d3cfce8ff1dda64e58fa72038602':
  truemotion1: check the header size

See: e7b43e8e84e48fccf64cdc62430cb8b5c69e804c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1713eec29add37b654ec6bf262b843d139c1ffc6'
Michael Niedermayer [Wed, 5 Feb 2014 00:56:39 +0000 (01:56 +0100)]
Merge commit '1713eec29add37b654ec6bf262b843d139c1ffc6'

* commit '1713eec29add37b654ec6bf262b843d139c1ffc6':
  shorten: pad the internal bitstream buffer

See: 89d998f1c1eddac3a1256e28ac00ccfdf4d3edd1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5430839144c6da0160e8e0cfb0c8db01de432e94'
Michael Niedermayer [Wed, 5 Feb 2014 00:42:06 +0000 (01:42 +0100)]
Merge commit '5430839144c6da0160e8e0cfb0c8db01de432e94'

* commit '5430839144c6da0160e8e0cfb0c8db01de432e94':
  eacmv: clear references on frame dimensions change

Conflicts:
libavcodec/eacmv.c

See: e9d443cf08503f7bd0149576ba9e891322de340d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'
Michael Niedermayer [Wed, 5 Feb 2014 00:30:18 +0000 (01:30 +0100)]
Merge commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6'

* commit '0e830094ad0dc251613a0aa3234d9c5c397e02e6':
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'
Michael Niedermayer [Wed, 5 Feb 2014 00:27:48 +0000 (01:27 +0100)]
Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'

* commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c':
  avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

Conflicts:
libavcodec/utils.c

No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'
Michael Niedermayer [Wed, 5 Feb 2014 00:18:48 +0000 (01:18 +0100)]
Merge commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27'

* commit 'd509ae5be0a9bac35a4cedbe68b774a74446bb27':
  jvdec: K&R formatting cosmetics

Conflicts:
libavcodec/jvdec.c
libavformat/jvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffplay: flush subtitle codecs as well with null packets
Marton Balint [Wed, 29 Jan 2014 23:55:18 +0000 (00:55 +0100)]
ffplay: flush subtitle codecs as well with null packets

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: reorder the filters to ensure that inputs of the custom filters are merged...
Marton Balint [Wed, 29 Jan 2014 22:00:52 +0000 (23:00 +0100)]
ffplay: reorder the filters to ensure that inputs of the custom filters are merged first

For more info see http://ffmpeg.org/pipermail/ffmpeg-user/2013-December/018761.html

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agompeg: K&R formatting cosmetics
Vittorio Giovara [Tue, 4 Feb 2014 13:57:54 +0000 (13:57 +0000)]
mpeg: K&R formatting cosmetics

Also adjust header #include order and some comments.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agodoxy: Format @code blocks so they render properly
Luca Barbato [Mon, 16 Dec 2013 00:39:30 +0000 (01:39 +0100)]
doxy: Format @code blocks so they render properly

@code command reports verbatim everything between it and @endcode.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolavf: improve handling of sparse streams when muxing
Luca Barbato [Mon, 20 Jan 2014 12:28:37 +0000 (13:28 +0100)]
lavf: improve handling of sparse streams when muxing

Currently ff_interleave_packet_per_dts() waits until it gets a frame for
each stream before outputting packets in interleaved order.

Sparse streams (i.e. streams with much fewer packets than the other
streams, like subtitles or audio with DTX) tend to add up latency and in
specific cases end up allocating a large amount of memory.

Emit the top packet from the packet_buffer if it has a time delta
larger than a specified threshold.

Original report of the issue and initial proposed solution by
mus.svz@gmail.com.

Bug-id: 31
Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agolagarith: reallocate rgb_planes when needed
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
lagarith: reallocate rgb_planes when needed

Fixes invalid writes on pixel format changes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agotruemotion1: check the header size
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
truemotion1: check the header size

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agoshorten: pad the internal bitstream buffer
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
shorten: pad the internal bitstream buffer

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agoeacmv: clear references on frame dimensions change
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
eacmv: clear references on frame dimensions change

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agoavcodec/vc1dec: remove blocks_off use from vc1_pred_b_mv()
Michael Niedermayer [Tue, 4 Feb 2014 19:31:47 +0000 (20:31 +0100)]
avcodec/vc1dec: remove blocks_off use from vc1_pred_b_mv()

it should always be 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/vc1dec: vc1_pred_b_mv() is not used for fields, simplify code
Michael Niedermayer [Tue, 4 Feb 2014 19:11:46 +0000 (20:11 +0100)]
avcodec/vc1dec: vc1_pred_b_mv() is not used for fields, simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosamplefmt: avoid integer overflow in av_samples_get_buffer_size()
Justin Ruggles [Thu, 30 Jan 2014 19:08:38 +0000 (14:08 -0500)]
samplefmt: avoid integer overflow in av_samples_get_buffer_size()

CC:libav-stable@libav.org

6 years agoMerge commit '1f097d168d9cad473dd44010a337c1413a9cd198'
Michael Niedermayer [Tue, 4 Feb 2014 15:26:43 +0000 (16:26 +0100)]
Merge commit '1f097d168d9cad473dd44010a337c1413a9cd198'

* commit '1f097d168d9cad473dd44010a337c1413a9cd198':
  h264: reset data partitioning at the beginning of each decode call

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'
Michael Niedermayer [Tue, 4 Feb 2014 15:10:24 +0000 (16:10 +0100)]
Merge commit 'e46ad30a808744ddf3855567e162292a4eaabac7'

* commit 'e46ad30a808744ddf3855567e162292a4eaabac7':
  vp8: use a fixed-size edge emu buffer

Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h

See: face578d56c2d1375e40d5e2a28acc122132bc55
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: use avformat_alloc_context()
Michael Niedermayer [Tue, 4 Feb 2014 15:01:02 +0000 (16:01 +0100)]
ffserver: use avformat_alloc_context()

Fixes null pointer dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'
Michael Niedermayer [Tue, 4 Feb 2014 14:37:05 +0000 (15:37 +0100)]
Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'

* commit '33c859c142ef3f49b7a6227014ad92a680cf4d74':
  lavf: ignore attachment streams for interleaving purposes

Conflicts:
libavformat/avformat.h
libavformat/internal.h
libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'
Michael Niedermayer [Tue, 4 Feb 2014 14:17:19 +0000 (15:17 +0100)]
Merge commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6'

* commit '7b03b65bf0d02519c86750d2da33f413e11cf0c6':
  lavf: do basic sanity checking on muxed packets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5de64bb34d68d6c224dca90003172d7a27958825'
Michael Niedermayer [Tue, 4 Feb 2014 14:08:29 +0000 (15:08 +0100)]
Merge commit '5de64bb34d68d6c224dca90003172d7a27958825'

* commit '5de64bb34d68d6c224dca90003172d7a27958825':
  utvideoenc: Add support for the new BT.709 FourCCs for YCbCr

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/dualinput: fix repeatlast to match docs and eof_action=pass
Michael Niedermayer [Tue, 4 Feb 2014 13:54:14 +0000 (14:54 +0100)]
avfilter/dualinput: fix repeatlast to match docs and eof_action=pass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'de203abd71baae7f120313259b45cf935c85203e'
Michael Niedermayer [Tue, 4 Feb 2014 13:33:33 +0000 (14:33 +0100)]
Merge commit 'de203abd71baae7f120313259b45cf935c85203e'

* commit 'de203abd71baae7f120313259b45cf935c85203e':
  vf_overlay: add eof_action switch

Conflicts:
doc/filters.texi
libavfilter/vf_overlay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: Suppress deprecation warnings from avcodec_alloc_frame()
Diego Biurrun [Tue, 4 Feb 2014 11:23:15 +0000 (03:23 -0800)]
avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

The function is itself obsolete and slated for removal.

6 years agoMerge commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e'
Michael Niedermayer [Tue, 4 Feb 2014 12:44:26 +0000 (13:44 +0100)]
Merge commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e'

* commit 'b25e84b7399bd91605596b67d761d3464dbe8a6e':
  hevc: check that the VCL NAL types are the same for all slice segments of a frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agojvdec: K&R formatting cosmetics
Vittorio Giovara [Fri, 13 Dec 2013 13:30:22 +0000 (14:30 +0100)]
jvdec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoh264: reset data partitioning at the beginning of each decode call
Anton Khirnov [Thu, 28 Nov 2013 09:54:35 +0000 (10:54 +0100)]
h264: reset data partitioning at the beginning of each decode call

Prevents using GetBitContexts with data from previous calls.

Fixes access to freed memory.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

6 years agovp8: use a fixed-size edge emu buffer
Anton Khirnov [Mon, 20 Jan 2014 12:12:54 +0000 (13:12 +0100)]
vp8: use a fixed-size edge emu buffer

The reason is the same as for e588615d938f8581f0d6f3771662d08cadfc00de

Based on a patch by Ronald S. Bultje <rsbultje@gmail.com>

6 years agolavf: ignore attachment streams for interleaving purposes
Anton Khirnov [Mon, 20 Jan 2014 12:59:06 +0000 (13:59 +0100)]
lavf: ignore attachment streams for interleaving purposes

Those streams should never get any packets by definition.

6 years agolavf: do basic sanity checking on muxed packets
Anton Khirnov [Mon, 20 Jan 2014 13:10:01 +0000 (14:10 +0100)]
lavf: do basic sanity checking on muxed packets

Reject packets for non-existing or attachment streams.

6 years agoutvideoenc: Add support for the new BT.709 FourCCs for YCbCr
Jan Ekström [Sun, 2 Feb 2014 13:04:58 +0000 (15:04 +0200)]
utvideoenc: Add support for the new BT.709 FourCCs for YCbCr

With cli usage the decoder might have not set the colorspace during
encoder init, manual colorspace override might be needed in such
cases.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agovf_overlay: add eof_action switch
Keith Lawson [Mon, 3 Feb 2014 00:39:18 +0000 (19:39 -0500)]
vf_overlay: add eof_action switch

Signed-off-by: Anton Khirnov <anton@khirnov.net>
6 years agohevc: check that the VCL NAL types are the same for all slice segments of a frame
Anton Khirnov [Sun, 2 Feb 2014 12:35:48 +0000 (13:35 +0100)]
hevc: check that the VCL NAL types are the same for all slice segments of a frame

Fixes possible invalid memory access for mismatching skipped/non-skipped
slice segments.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Sample-Id: 00001533-google

6 years agoavcodec/h264: update current_sps & sps->new only after the whole slice header decoder...
Michael Niedermayer [Tue, 4 Feb 2014 01:20:59 +0000 (02:20 +0100)]
avcodec/h264: update current_sps & sps->new only after the whole slice header decoder and init code finished

This avoids them being cleared before the full initialization finished

Fixes out of array read
Fixes: asan_heap-oob_f0c5e6_7071_cov_1605985132_mov_h264_aac__Demo_FlagOfOurFathers.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: Disallow pps_id changing between slices
Michael Niedermayer [Mon, 3 Feb 2014 22:52:38 +0000 (23:52 +0100)]
avcodec/h264: Disallow pps_id changing between slices

Such changes are forbidden in H.264 and lead to race conditions

Fixes out of array read
Fixes: signal_sigsegv_f9796a_1613_cov_3114610371_FM1_BT_B.h264
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: clear dequant8_coeff pointers if 8x8 mode is not enabled
Michael Niedermayer [Mon, 3 Feb 2014 21:15:32 +0000 (22:15 +0100)]
avcodec/h264: clear dequant8_coeff pointers if 8x8 mode is not enabled

This prevents stale pointers from being left

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoFix compilation with msvc/icl due to missing header and define.
Matt Oliver [Mon, 3 Feb 2014 06:46:11 +0000 (17:46 +1100)]
Fix compilation with msvc/icl due to missing header and define.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'dilaroga/master'
Michael Niedermayer [Mon, 3 Feb 2014 14:33:56 +0000 (15:33 +0100)]
Merge remote-tracking branch 'dilaroga/master'

* dilaroga/master:
  vda: fix crash when a frame is dropped.

Merged-by: Michael Niedermayer <michaelni@gmx.at>