ffmpeg.git
4 years agoavfilter/avf_showspectrum: use av_calloc()
Paul B Mahol [Thu, 6 Aug 2015 12:58:13 +0000 (14:58 +0200)]
avfilter/avf_showspectrum: use av_calloc()

4 years agoavcodec/diracdec: Move reference to DiracFrame, avoid use of the deprecated field...
Michael Niedermayer [Thu, 6 Aug 2015 10:43:35 +0000 (12:43 +0200)]
avcodec/diracdec: Move reference to DiracFrame, avoid use of the deprecated field from AVFrame

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/options: Silence deprecated warning about coded_frame
Michael Niedermayer [Thu, 6 Aug 2015 10:39:37 +0000 (12:39 +0200)]
avcodec/options: Silence deprecated warning about coded_frame

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc: propagate hwaccel errors
wm4 [Wed, 5 Aug 2015 17:54:41 +0000 (19:54 +0200)]
lavc: propagate hwaccel errors

At least the new videotoolbox decoder does not actually set a frame if
end_frame fails. This causes the API to return success and signals that
a picture was decoded, even though AVFrame->data[0] is NULL.

Fix this by propagating end_frame errors.

4 years agoavformat/matroskaenc: Avoid "for (int i" syntax for better compatibility
Michael Niedermayer [Wed, 5 Aug 2015 23:15:08 +0000 (01:15 +0200)]
avformat/matroskaenc: Avoid "for (int i" syntax for better compatibility

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocheckasm: Remove unnecessary include
Henrik Gramner [Wed, 5 Aug 2015 17:05:56 +0000 (19:05 +0200)]
checkasm: Remove unnecessary include

4 years agoavcodec: loongson optimized h264pred with mmi v2
周晓勇 [Tue, 4 Aug 2015 12:05:17 +0000 (20:05 +0800)]
avcodec: loongson optimized h264pred with mmi v2

Signed-off-by: ZhouXiaoyong <zhouxiaoyong@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavformat/matroska: Write stream durations in metadata, in the format of mkvmerge.
Sasi Inguva [Wed, 5 Aug 2015 05:09:57 +0000 (22:09 -0700)]
libavformat/matroska: Write stream durations in metadata, in the format of mkvmerge.

Compute individual stream durations in matroska muxer.
Write them as string tags in the same format as mkvmerge tool does.

Signed-off-by: Sasi Inguva <isasi@google.com>
4 years agoffplay: do not block audio thread on WIN32
Marton Balint [Sun, 8 Feb 2015 18:30:46 +0000 (19:30 +0100)]
ffplay: do not block audio thread on WIN32

The windows SDL audio driver plays the old data in the buffer in a loop if it
is not updated in time. So instead of waiting for data and blocking the the
audio thread, return silence if no data is available.

Should fix ticket #2289.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agox86inc: warn if XOP integer FMA instruction emulation is impossible
Anton Mitrofanov [Fri, 14 Feb 2014 11:53:58 +0000 (13:53 +0200)]
x86inc: warn if XOP integer FMA instruction emulation is impossible

Signed-off-by: Henrik Gramner <henrik@gramner.com>
4 years agoavcodec/avcodec: Define CODEC_CAP_* based on AV_CODEC_CAP_*
Michael Niedermayer [Wed, 5 Aug 2015 13:04:02 +0000 (15:04 +0200)]
avcodec/avcodec: Define CODEC_CAP_* based on AV_CODEC_CAP_*

Avoid duplicating the literal numeric values

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/avcodec: Replace AV_CODEC_FLAG* values by 1 << C style for consistency
Michael Niedermayer [Wed, 5 Aug 2015 13:24:59 +0000 (15:24 +0200)]
avcodec/avcodec: Replace AV_CODEC_FLAG* values by 1 << C style for consistency

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/hapenc: Remove use of deprecated ff_alloc_packet()
Michael Niedermayer [Wed, 5 Aug 2015 12:55:33 +0000 (14:55 +0200)]
avcodec/hapenc: Remove use of deprecated ff_alloc_packet()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovf_psnr: add psnr_avg to stats file.
Ronald S. Bultje [Wed, 5 Aug 2015 11:30:16 +0000 (07:30 -0400)]
vf_psnr: add psnr_avg to stats file.

4 years agoMerge commit 'b197f78329615893201c0e241d00b71b7c749dbb'
Hendrik Leppkes [Wed, 5 Aug 2015 10:19:07 +0000 (12:19 +0200)]
Merge commit 'b197f78329615893201c0e241d00b71b7c749dbb'

* commit 'b197f78329615893201c0e241d00b71b7c749dbb':
  configure: Silence error messages when probing compiler

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'
Hendrik Leppkes [Wed, 5 Aug 2015 10:18:31 +0000 (12:18 +0200)]
Merge commit '98c9ade9853a9c413534ef243174d65f3f7506fa'

* commit '98c9ade9853a9c413534ef243174d65f3f7506fa':
  drawtext: Move the strftime expansion in a separate function

Not merged, the code does not exist anymore.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'
Hendrik Leppkes [Wed, 5 Aug 2015 10:15:41 +0000 (12:15 +0200)]
Merge commit 'fe026ba960790a004adfcff33f44f96b05538e5c'

* commit 'fe026ba960790a004adfcff33f44f96b05538e5c':
  drawtext: Drop stray guards

Conflicts:
libavfilter/vf_drawtext.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'
Hendrik Leppkes [Wed, 5 Aug 2015 10:10:08 +0000 (12:10 +0200)]
Merge commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb'

* commit '4fee11ab05fc8569ef35c0ce86a60375c903eefb':
  png: Be more informative regarding signature errors

Conflicts:
libavcodec/pngdec.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavcodec/dvbsubdec: Do not stop decoding at a invalid depth
Michael Niedermayer [Tue, 4 Aug 2015 21:43:57 +0000 (23:43 +0200)]
avcodec/dvbsubdec: Do not stop decoding at a invalid depth

This corrects parsing the later elements

Fixes Ticket4754

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/nvenc: Add support for 2pass rc in vbr mode
Timo Rothenpieler [Tue, 4 Aug 2015 17:57:10 +0000 (19:57 +0200)]
avcodec/nvenc: Add support for 2pass rc in vbr mode

Thanks to WereCatf for pointing out this now exists.

Github: Closes #143

4 years agoavcodec/nvenc: Only set h264 parameter when encoding h264
Timo Rothenpieler [Tue, 4 Aug 2015 17:49:42 +0000 (19:49 +0200)]
avcodec/nvenc: Only set h264 parameter when encoding h264

4 years agoavcodec/nvenc: Fix indentation
Timo Rothenpieler [Tue, 4 Aug 2015 17:47:32 +0000 (19:47 +0200)]
avcodec/nvenc: Fix indentation

4 years agowmv2enc: remove duplicate priv_class in codec definition
Hendrik Leppkes [Tue, 4 Aug 2015 19:34:16 +0000 (21:34 +0200)]
wmv2enc: remove duplicate priv_class in codec definition

4 years agolavf/swf: Fix auto-detection of compressed files.
Carl Eugen Hoyos [Tue, 4 Aug 2015 19:32:01 +0000 (21:32 +0200)]
lavf/swf: Fix auto-detection of compressed files.

Fixes auto-detection of compressed swf files as in
http://samples.ffmpeg.org/SWF/compressed-swf/
Reported by forum user Zard1096.

4 years agox86inc: Drop SECTION_TEXT macro
Henrik Gramner [Wed, 27 May 2015 19:38:14 +0000 (21:38 +0200)]
x86inc: Drop SECTION_TEXT macro

The .text section is already 16-byte aligned by default on all supported
platforms so `SECTION_TEXT` isn't any different from `SECTION .text`.

4 years agox86inc: Support arbitrary stack alignments
Henrik Gramner [Sun, 9 Feb 2014 22:58:04 +0000 (00:58 +0200)]
x86inc: Support arbitrary stack alignments

Change ALLOC_STACK to always align the stack before allocating stack space for
consistency. Previously alignment would occur either before or after allocating
stack space depending on whether manual alignment was required or not.

4 years agoffmpeg: remove access to private FILE struct members on Windows
Hendrik Leppkes [Mon, 3 Aug 2015 15:08:49 +0000 (17:08 +0200)]
ffmpeg: remove access to private FILE struct members on Windows

The FILE struct is opaque in MSVC 2015, and the members of this struct
were never meant to be accessed in any case.

No conditions are known where this check was needed to get characters
from stdin.

4 years agoffmpeg: avoid scanf in keyboard command parsing
Hendrik Leppkes [Mon, 3 Aug 2015 20:02:17 +0000 (22:02 +0200)]
ffmpeg: avoid scanf in keyboard command parsing

Mixing stdio and low-level IO on stdin is not safe.

4 years agoMAINTAINERS: Add myself to vdpau maintainers
Philip Langdale [Mon, 3 Aug 2015 15:19:54 +0000 (08:19 -0700)]
MAINTAINERS: Add myself to vdpau maintainers

4 years agoavcodec/vdpau_hevc: Properly signal the num_delta_pocs from the SPS RPS
Philip Langdale [Sat, 13 Jun 2015 17:53:42 +0000 (10:53 -0700)]
avcodec/vdpau_hevc: Properly signal the num_delta_pocs from the SPS RPS

This is the same fix that Hendrik made to dxva2_hevc. It should be
equally required here, although I don't see any visual difference.
Nevertheless, best to stay consistent.

4 years agoavcodec/vdpau_hevc: Remove experimental flag
Philip Langdale [Tue, 4 Aug 2015 03:58:05 +0000 (20:58 -0700)]
avcodec/vdpau_hevc: Remove experimental flag

The latest nvidia 355.06 drivers fixes the interleaving bug when
video surfaces are rendered. It still seems to be broken for
read-back with getBits but that's sufficiently uninteresting that
I don't think we need to wait for it to remove the flag.

4 years agoavcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP8 functions
Shivraj Patil [Tue, 4 Aug 2015 06:49:11 +0000 (12:19 +0530)]
avcodec/mips: MSA (MIPS-SIMD-Arch) optimizations for VP8 functions

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
4 years agoavfilter/avf_showspectrum: reindent
Paul B Mahol [Tue, 4 Aug 2015 13:18:51 +0000 (15:18 +0200)]
avfilter/avf_showspectrum: reindent

4 years agolavc/dvbsub: Do not fail on clut depth 0.
Carl Eugen Hoyos [Tue, 4 Aug 2015 13:01:22 +0000 (15:01 +0200)]
lavc/dvbsub: Do not fail on clut depth 0.

Fixes ticket #4752.

4 years agolavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.
Carl Eugen Hoyos [Tue, 4 Aug 2015 12:59:26 +0000 (14:59 +0200)]
lavd/v4l2: Use AVSTREAM_PARSE_FULL_ONCE when reading a h264 stream.

Reported, debugged and tested by trac user noah.
Fixes ticket #4644.

4 years agoavcodec/dvbsubdec: Allow selecting the substream, or all substreams
Michael Niedermayer [Mon, 27 Jul 2015 14:31:05 +0000 (16:31 +0200)]
avcodec/dvbsubdec: Allow selecting the substream, or all substreams

Fixes Ticket 2161

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/mxfdec: support segmented frame layout as separate fields layout
Matthieu Bouron [Wed, 22 Jul 2015 13:29:42 +0000 (15:29 +0200)]
lavf/mxfdec: support segmented frame layout as separate fields layout

According to S377M, segmented frame layout is identical to separate
field layout except that the two fields are taken from a single scan
of the incoming image, ie: they are coincident in time. Thus the
resulting frame is progressive.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: Silence error messages when probing compiler
Shiz [Mon, 3 Aug 2015 10:44:44 +0000 (12:44 +0200)]
configure: Silence error messages when probing compiler

On Xcode's clang on OS X, $cc --version will output a 'Configured with:'
line to stderr, which clobbers the configure script output. As this line
serves no further purpose, it should be silenced.

The same applies to apple-gcc 4.2.1, which complains that it can not
understand the kernel version it is running on.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoconfigure: Silence error messages when probing compiler.
Shiz [Mon, 3 Aug 2015 10:20:59 +0000 (12:20 +0200)]
configure: Silence error messages when probing compiler.

On Xcode's clang on OS X, $cc --version will output a 'Configured with:'
line to stderr, which clobbers the configure script output. As this line
serves no further purpose, it should be silenced.

The same applies to apple-gcc 4.2.1, which complains that it can not
understand the kernel version it is running on.

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/dcaenc: clear bitstream end
Michael Niedermayer [Tue, 4 Aug 2015 01:11:15 +0000 (03:11 +0200)]
avcodec/dcaenc: clear bitstream end

This avoids leaving uninitialized bits in the output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/internal: improve min_size documentation for ff_alloc_packet2()
Michael Niedermayer [Mon, 3 Aug 2015 16:33:03 +0000 (18:33 +0200)]
avcodec/internal: improve min_size documentation for ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agox86: move XOP emulation code back to x86inc
James Almer [Mon, 3 Aug 2015 06:28:37 +0000 (03:28 -0300)]
x86: move XOP emulation code back to x86inc

Only two functions that use xop multiply-accumulate instructions where the
first operand is the same as the fourth actually took advantage of the macros.

This further reduces differences with x264's x86inc.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agodoc/git-howto: Replace "git push" example by one with dry-run
Michael Niedermayer [Mon, 3 Aug 2015 09:56:31 +0000 (11:56 +0200)]
doc/git-howto: Replace "git push" example by one with dry-run

I do not think having "git push" as example is a good idea.
The command has a very high chance of pushing things which are unwanted to be
pushed

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
Hendrik Leppkes [Mon, 2 Mar 2015 11:04:33 +0000 (12:04 +0100)]
dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS

ucNumDeltaPocsOfRefRpsIdx needs to contain the flat value from the SPS RPS,
and not the final computed value from the slice header RPS, as this calculation
is done internally by the driver again.

Sample-Id: http://trailers.divx.com/hevc/Sintel_4k_27qp_24fps_1aud_9subs.mkvi

4 years agoavcodec/videotoolbox: Add missing AV_ prefix to CODEC_ID in comment
Michael Niedermayer [Mon, 3 Aug 2015 12:47:11 +0000 (14:47 +0200)]
avcodec/videotoolbox: Add missing AV_ prefix to CODEC_ID in comment

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/videotoolbox: Fix bistream typo
Michael Niedermayer [Mon, 3 Aug 2015 12:46:24 +0000 (14:46 +0200)]
avcodec/videotoolbox: Fix bistream typo

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/pcm: Better min_size for ff_alloc_packet2()
Michael Niedermayer [Mon, 3 Aug 2015 12:06:28 +0000 (14:06 +0200)]
avcodec/pcm: Better min_size for ff_alloc_packet2()

33318 -> 30601 decicycles

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libwebpenc_animencoder: Use ff_alloc_packet2()
Michael Niedermayer [Mon, 3 Aug 2015 11:20:41 +0000 (13:20 +0200)]
avcodec/libwebpenc_animencoder: Use ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/rawenc: Use ff_alloc_packet2()
Michael Niedermayer [Mon, 3 Aug 2015 10:39:37 +0000 (12:39 +0200)]
avcodec/rawenc: Use ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: add new Videotoolbox hwaccel.
Sebastien Zwickert [Sat, 11 Jul 2015 11:23:21 +0000 (13:23 +0200)]
avcodec: add new Videotoolbox hwaccel.

4 years agox86inc: Various minor backports from x264
Henrik Gramner [Sun, 2 Aug 2015 20:40:03 +0000 (22:40 +0200)]
x86inc: Various minor backports from x264

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agox86inc: Disable vpbroadcastq workaround in newer yasm versions
Henrik Gramner [Sun, 2 Aug 2015 20:40:01 +0000 (22:40 +0200)]
x86inc: Disable vpbroadcastq workaround in newer yasm versions

The bug was fixed in 1.3.0, so only perform the workaround in earlier versions.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aacdec: Fix integer overflow in argument to decode_audio_specific_config()
Michael Niedermayer [Sun, 2 Aug 2015 23:22:27 +0000 (01:22 +0200)]
avcodec/aacdec: Fix integer overflow in argument to decode_audio_specific_config()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()
Emanuel Czirai [Sun, 2 Aug 2015 22:58:46 +0000 (00:58 +0200)]
libavcodec/aacdec_template: Use init_get_bits8() in aac_decode_frame()

related to ticket4749

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/cngenc: Use ff_alloc_packet2()
Michael Niedermayer [Sun, 2 Aug 2015 21:02:12 +0000 (23:02 +0200)]
avcodec/cngenc: Use ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libwebpenc: Use ff_alloc_packet2()
Michael Niedermayer [Sun, 2 Aug 2015 18:58:31 +0000 (20:58 +0200)]
avcodec/libwebpenc: Use ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/v210enc: Use ff_alloc_packet2()
Michael Niedermayer [Sun, 2 Aug 2015 18:57:39 +0000 (20:57 +0200)]
avcodec/v210enc: Use ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/aliaspixenc: Use ff_alloc_packet2()
Michael Niedermayer [Sun, 2 Aug 2015 18:36:24 +0000 (20:36 +0200)]
avcodec/aliaspixenc: Use ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/avuienc: Use ff_alloc_packet2()
Michael Niedermayer [Sun, 2 Aug 2015 18:24:30 +0000 (20:24 +0200)]
avcodec/avuienc: Use ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolibshine: Fix faulty ff_alloc_packet2 usage
Rico Tzschichholz [Sun, 2 Aug 2015 16:11:03 +0000 (18:11 +0200)]
libshine: Fix faulty ff_alloc_packet2 usage

4 years agoavcodec/xfaceenc: remove coded_frame usage
Paul B Mahol [Sun, 2 Aug 2015 16:41:12 +0000 (18:41 +0200)]
avcodec/xfaceenc: remove coded_frame usage

4 years agoavfilter: add atadenoise
Paul B Mahol [Wed, 29 Jul 2015 17:04:28 +0000 (19:04 +0200)]
avfilter: add atadenoise

4 years agodrawtext: Move the strftime expansion in a separate function
Luca Barbato [Sat, 1 Aug 2015 09:22:11 +0000 (11:22 +0200)]
drawtext: Move the strftime expansion in a separate function

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agodrawtext: Drop stray guards
Luca Barbato [Fri, 31 Jul 2015 11:49:03 +0000 (13:49 +0200)]
drawtext: Drop stray guards

There is a fallback for localtime_r and it is in use already.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agopng: Be more informative regarding signature errors
Luca Barbato [Fri, 31 Jul 2015 12:24:08 +0000 (14:24 +0200)]
png: Be more informative regarding signature errors

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavfilter: add allyuv source filter
Paul B Mahol [Thu, 23 Jul 2015 07:07:26 +0000 (07:07 +0000)]
avfilter: add allyuv source filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/vf_deband: add mising slice thread flag
Paul B Mahol [Sun, 2 Aug 2015 12:00:34 +0000 (14:00 +0200)]
avfilter/vf_deband: add mising slice thread flag

4 years agoavfilter/f_drawgraph: stop making foreground color transparent
Paul B Mahol [Sun, 2 Aug 2015 11:31:45 +0000 (13:31 +0200)]
avfilter/f_drawgraph: stop making foreground color transparent

4 years agoMAINTAINERS: Add myself as maintainer for dxva2 and Windows/MSVC
Hendrik Leppkes [Sat, 1 Aug 2015 09:11:14 +0000 (11:11 +0200)]
MAINTAINERS: Add myself as maintainer for dxva2 and Windows/MSVC

4 years agoavcodec/libutvideoenc: Remove coded_frame usage
Michael Niedermayer [Sun, 2 Aug 2015 10:48:23 +0000 (12:48 +0200)]
avcodec/libutvideoenc: Remove coded_frame usage

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '14e558024642638085ae2bbeffc6087612e6a3f9'
Hendrik Leppkes [Sun, 2 Aug 2015 10:40:53 +0000 (12:40 +0200)]
Merge commit '14e558024642638085ae2bbeffc6087612e6a3f9'

* commit '14e558024642638085ae2bbeffc6087612e6a3f9':
  opusdec: properly handle mismatching configurations in multichannel streams

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'
Hendrik Leppkes [Sun, 2 Aug 2015 10:32:10 +0000 (12:32 +0200)]
Merge commit 'fdbc544d29176ba69d67dd879df4696f0a19052e'

* commit 'fdbc544d29176ba69d67dd879df4696f0a19052e':
  asfdec: prevent the memory leak while reading metadata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db'
Hendrik Leppkes [Sun, 2 Aug 2015 10:31:39 +0000 (12:31 +0200)]
Merge commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db'

* commit 'ebaf571aca2dd6ce3caeeeec4210a3fccd47e7db':
  x86: dct: Disable dct32_float_sse on x86-64

Conflicts:
libavcodec/x86/dct32.asm
libavcodec/x86/dct_init.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '979cb55103fa8e8274806e496901203742c686d1'
Hendrik Leppkes [Sun, 2 Aug 2015 10:29:30 +0000 (12:29 +0200)]
Merge commit '979cb55103fa8e8274806e496901203742c686d1'

* commit '979cb55103fa8e8274806e496901203742c686d1':
  hevc: Split the sei parsing in 3 functions

Conflicts:
libavcodec/hevc_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '043f46f5741e1a5caedf55d788e1a72aae3b7605'
Hendrik Leppkes [Sun, 2 Aug 2015 10:25:41 +0000 (12:25 +0200)]
Merge commit '043f46f5741e1a5caedf55d788e1a72aae3b7605'

* commit '043f46f5741e1a5caedf55d788e1a72aae3b7605':
  hevc: Use switch instead of if-nests in decode_nal_sei_message

Conflicts:
libavcodec/hevc_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '2cd841c0776535be56e4db67485fdd9509c9b9f4'
Hendrik Leppkes [Sun, 2 Aug 2015 10:18:40 +0000 (12:18 +0200)]
Merge commit '2cd841c0776535be56e4db67485fdd9509c9b9f4'

* commit '2cd841c0776535be56e4db67485fdd9509c9b9f4':
  hevc: Use a proper enum for the SEI values

Conflicts:
libavcodec/hevc_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agotests/fate/mp3: Fix fate-mp3-float-extra_overread on mips-qemu
Michael Niedermayer [Sun, 2 Aug 2015 09:26:58 +0000 (11:26 +0200)]
tests/fate/mp3: Fix fate-mp3-float-extra_overread on mips-qemu

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'
Hendrik Leppkes [Sun, 2 Aug 2015 08:51:53 +0000 (10:51 +0200)]
Merge commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1'

* commit '80ea66112817c719b476de8f7d8d3b325f4c7dd1':
  avcodec: h264: Extract decoder methods

Conflicts:
libavcodec/h264_sei.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:56 +0000 (10:41 +0200)]
Merge commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672'

* commit '33dc1913ab7aaefc991b3e665d1d0b5d0b088672':
  asfdec: remove improper assignement that caused wrong timestamps

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961'
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:45 +0000 (10:41 +0200)]
Merge commit '78491fe8cfed83d2aead95dafe26f0d3f999e961'

* commit '78491fe8cfed83d2aead95dafe26f0d3f999e961':
  asfdec: do not export empty metadata

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '3e853ff7acc56b180950ab39e7282f1b938c8784'
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:26 +0000 (10:41 +0200)]
Merge commit '3e853ff7acc56b180950ab39e7282f1b938c8784'

* commit '3e853ff7acc56b180950ab39e7282f1b938c8784':
  des: extend av_des_init() doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'
Hendrik Leppkes [Sun, 2 Aug 2015 08:41:16 +0000 (10:41 +0200)]
Merge commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac'

* commit 'd9e8b47e3144262d6bc4681740411d4bdafad6ac':
  des: add av_des_alloc()

Conflicts:
libavutil/des.c

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'
Hendrik Leppkes [Sun, 2 Aug 2015 08:39:37 +0000 (10:39 +0200)]
Merge commit '5d8bea3bb2357bb304f8f771a4107039037c5549'

* commit '5d8bea3bb2357bb304f8f771a4107039037c5549':
  xtea: add av_xtea_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'b469832de993dabbfe037bef59c68e90e82ebca5'
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:53 +0000 (10:38 +0200)]
Merge commit 'b469832de993dabbfe037bef59c68e90e82ebca5'

* commit 'b469832de993dabbfe037bef59c68e90e82ebca5':
  rc4: extend av_rc4_init() doxy

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:33 +0000 (10:38 +0200)]
Merge commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a'

* commit 'ae365453c370c85f278bff7fbf9e20d9d335cb2a':
  rc4: add av_rc4_alloc()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'
Hendrik Leppkes [Sun, 2 Aug 2015 08:38:12 +0000 (10:38 +0200)]
Merge commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9'

* commit '7a7df34c91e16ea8936f59524145a2cdd6b790f9':
  blowfish: add av_blowfish_alloc()

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'cd4d9df22738e6f147521ccb72c7930db6050914'
Hendrik Leppkes [Sun, 2 Aug 2015 08:34:18 +0000 (10:34 +0200)]
Merge commit 'cd4d9df22738e6f147521ccb72c7930db6050914'

* commit 'cd4d9df22738e6f147521ccb72c7930db6050914':
  asfdec: free AVDictionaries properly when closing the demuxer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '90e648c508fa6b97587ce62699a1449123f7d285'
Hendrik Leppkes [Sun, 2 Aug 2015 08:32:38 +0000 (10:32 +0200)]
Merge commit '90e648c508fa6b97587ce62699a1449123f7d285'

* commit '90e648c508fa6b97587ce62699a1449123f7d285':
  fate/mp3: use the f32le format as output

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoopusdec: properly handle mismatching configurations in multichannel streams
Anton Khirnov [Mon, 27 Jul 2015 09:13:53 +0000 (11:13 +0200)]
opusdec: properly handle mismatching configurations in multichannel streams

The substreams can have different resampling delays, so an additional
level of buffering is needed to synchronize them.

Bug-Id: 876

4 years agoasfdec: prevent the memory leak while reading metadata
Alexandra Hájková [Fri, 31 Jul 2015 07:53:40 +0000 (09:53 +0200)]
asfdec: prevent the memory leak while reading metadata

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agox86: dct: Disable dct32_float_sse on x86-64
Henrik Gramner [Sat, 1 Aug 2015 15:12:48 +0000 (17:12 +0200)]
x86: dct: Disable dct32_float_sse on x86-64

There is an SSE2 implementation so the SSE version is never used. The "SSE"
version also happens to contain SSE2 instructions on x86-64.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoavcodec/hevc_mp4toannexb_bsf: Remove ;;
Michael Niedermayer [Sun, 2 Aug 2015 01:52:37 +0000 (03:52 +0200)]
avcodec/hevc_mp4toannexb_bsf: Remove ;;

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/mov: fix regression in processing .aax files
Vesselin Bontchev [Fri, 31 Jul 2015 10:16:08 +0000 (12:16 +0200)]
avformat/mov: fix regression in processing .aax files

Commit 0a551cbe introduced "activation_bytes" option, and not specifying
this option (while calling ffmpeg / ffprobe) causes the program to quit
early. Before this commit, ffprobe was capable of processing metadata in
.aax files.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/avf_showvolume: stop making output fully transparent
Paul B Mahol [Sat, 1 Aug 2015 17:36:10 +0000 (19:36 +0200)]
avfilter/avf_showvolume: stop making output fully transparent

4 years agoaacenc: add description to the 'aac_coder' option
Rostislav Pehlivanov [Sat, 1 Aug 2015 16:40:30 +0000 (17:40 +0100)]
aacenc: add description to the 'aac_coder' option

This commit adds a short description to the aac_coder option of the
AAC encoder in order to be consistent with the other options.
Generally, right now, the 'FAAC' method works fine with speech and
low broadband spectrum audio. 'Fast' is just as the name suggests.
'ANMR' still needs work and 'Twoloop', the default, works well with
every type of audio.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agohevc: Split the sei parsing in 3 functions
Luca Barbato [Sat, 1 Aug 2015 13:39:44 +0000 (15:39 +0200)]
hevc: Split the sei parsing in 3 functions

4 years agohevc: Use switch instead of if-nests in decode_nal_sei_message
Luca Barbato [Sat, 25 Jul 2015 13:26:29 +0000 (15:26 +0200)]
hevc: Use switch instead of if-nests in decode_nal_sei_message

Makes simpler to add support for more SEI types.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agohevc: Use a proper enum for the SEI values
Luca Barbato [Sat, 25 Jul 2015 13:26:28 +0000 (15:26 +0200)]
hevc: Use a proper enum for the SEI values

And use the correct value for decoded_picture_hash.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec: h264: Extract decoder methods
David Holm [Fri, 31 Jul 2015 19:06:13 +0000 (21:06 +0200)]
avcodec: h264: Extract decoder methods

Extract two methods from decode_registered_user_data in order to improve
code readability. Also make the constant holding the allocation size a
64-bit unsigned integer so that the size comparison against INT_MAX makes
sense.

Bug-Id: CID1312090

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoRevert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD...
Michael Niedermayer [Sat, 1 Aug 2015 01:25:04 +0000 (03:25 +0200)]
Revert "libavcodec/utils: av_get_exact_bits_per_sample fixed to return "1" for DSD codecs."

Requested-by: Ganesh Ajjanagadde <gajjanag@mit.edu> (original patch reviewer)
This reverts commit 293e25be615d43c9b611c4b04920ec0d245a7145.