OSDN Git Service

android-x86/external-ffmpeg.git
7 years agohevc: Move hevc_decode_extradata before frame decoding
Vittorio Giovara [Wed, 2 Nov 2016 15:48:57 +0000 (11:48 -0400)]
hevc: Move hevc_decode_extradata before frame decoding

Avoids a forward-declaration in the following commit.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoffmpeg: fix width/height overrides for sub2video processing
Hendrik Leppkes [Thu, 3 Nov 2016 15:20:59 +0000 (16:20 +0100)]
ffmpeg: fix width/height overrides for sub2video processing

7 years agoMerge commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0'
Hendrik Leppkes [Thu, 3 Nov 2016 13:53:58 +0000 (14:53 +0100)]
Merge commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0'

* commit '722ec3eb35bc152ce91d0a4502eca0df1c0086d0':
  avconv: decouple configuring filtergraphs and setting input parameters

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
7 years agoppc: pixblockdsp: do unaligned block accesses correctly again
Andreas Cadhalpun [Wed, 2 Nov 2016 20:28:49 +0000 (21:28 +0100)]
ppc: pixblockdsp: do unaligned block accesses correctly again

This was broken by the following Libav commit:
4c387c7 ppc: dsputil: do unaligned block accesses correctly

The following tests fail due to this:
fate-checkasm
fate-vsynth1-dnxhd-2k-hr-hq fate-vsynth1-dnxhd-edge1-hr
fate-vsynth1-dnxhd-edge2-hr fate-vsynth1-dnxhd-edge3-hr
fate-vsynth1-dnxhd-hr-sq-mov fate-vsynth1-dnxhd-hr-hq-mov
fate-vsynth2-dnxhd-2k-hr-hq fate-vsynth2-dnxhd-edge1-hr
fate-vsynth2-dnxhd-edge2-hr fate-vsynth2-dnxhd-edge3-hr
fate-vsynth2-dnxhd-hr-sq-mov fate-vsynth2-dnxhd-hr-hq-mov
fate-vsynth3-dnxhd-2k-hr-hq fate-vsynth3-dnxhd-edge1-hr
fate-vsynth3-dnxhd-edge2-hr fate-vsynth3-dnxhd-edge3-hr
fate-vsynth3-dnxhd-hr-sq-mov fate-vsynth3-dnxhd-hr-hq-mov

Fixes trac ticket #5508.

Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoavformat: close parser if codec changed
Andreas Cadhalpun [Mon, 17 Oct 2016 18:26:51 +0000 (20:26 +0200)]
avformat: close parser if codec changed

The parser depends on the codec and thus must not be used with a different one.
If it is, the 'avctx->codec_id == s->parser->codec_ids[0] ...' assert in
av_parser_parse2 gets triggered.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agocrystalhd: Update high level description
Philip Langdale [Sun, 16 Oct 2016 21:14:52 +0000 (14:14 -0700)]
crystalhd: Update high level description

We don't need to document the horrible hacks that we removed.

7 years agocrystalhd: Simplify output frame handling
Philip Langdale [Sun, 16 Oct 2016 21:06:13 +0000 (14:06 -0700)]
crystalhd: Simplify output frame handling

The old code had to retain a partial frame across two calls in
the case of separate interlaced fields. Now, we know that we'll
get both fields within the same receive_frame call, and so we
don't need to manage the frame as private state any more.

7 years agocrystalhd: Loop for a frame internally where possible.
Philip Langdale [Wed, 12 Oct 2016 03:17:06 +0000 (20:17 -0700)]
crystalhd: Loop for a frame internally where possible.

It's not possible to return EAGAIN when we've passed input EOF and are
in draining mode. If do return EAGAIN, we're saying there's no way to
get any more output - which isn't true in many cases.

So let's handled these cases in an internal loop as best we can.

7 years agocrystalhd: Keep NOPTS_VALUE so we know it's not there.
Philip Langdale [Sat, 15 Oct 2016 19:44:32 +0000 (12:44 -0700)]
crystalhd: Keep NOPTS_VALUE so we know it's not there.

7 years agocrystalhd: Remove h.264 parser
Philip Langdale [Wed, 12 Oct 2016 04:00:17 +0000 (21:00 -0700)]
crystalhd: Remove h.264 parser

Now that we don't need to do ridiculous things to work out if a
frame is interlaced or not, we don't need an extra h.264 parser.

7 years agocrystalhd: We don't need the track the last picture number anymore
Philip Langdale [Sun, 16 Oct 2016 18:01:40 +0000 (11:01 -0700)]
crystalhd: We don't need the track the last picture number anymore

This was needed to detect an interlaced failure case that doesn't
happen with the new decode api.

7 years agocrystalhd: Remove trust_interlaced heuristic
Philip Langdale [Mon, 10 Oct 2016 03:54:27 +0000 (20:54 -0700)]
crystalhd: Remove trust_interlaced heuristic

It seems that without all the other 1:1 heuristics, we don't have
a fundamental problem trusting the interlaced flag on output
pictures. That's a relief.

7 years agocrystalhd: Revert back to letting hardware handle packed b-frames
Philip Langdale [Sat, 15 Oct 2016 22:50:29 +0000 (15:50 -0700)]
crystalhd: Revert back to letting hardware handle packed b-frames

I'm not sure why, but the mpeg4_unpack_bframes bsf is not
interacting well with seeking. Looking at the code, it should be
ok, with possibly one warning shown, but I see it getting stuck
for an extended period of time after a seek where a packed frame
is cached to be shown later.

So, I gave up on that and went back to making the old hardware
based path work. Turns out that it wasn't broken except that some
samples have a 6 byte drop packet which I wasn't accounting for.

Now it works again and seeks are good.

7 years agocrystalhd: Switch to new decode API and remove the insanity
Philip Langdale [Mon, 10 Oct 2016 03:46:38 +0000 (20:46 -0700)]
crystalhd: Switch to new decode API and remove the insanity

The new decode API allows for m:n decode patterns, which is what
you need to use this hardware in a sane way. There are so many
situations where 1:1 doesn't happen naturally that it's a miracle
I got it working as well as I did.

With this change, we can throw all of the crazy heuristics and
sleeps(!) out, and things work correctly.

7 years agocrystalhd: Fix up the missing first sample
Philip Langdale [Sat, 15 Oct 2016 20:30:52 +0000 (13:30 -0700)]
crystalhd: Fix up the missing first sample

Why on earth the hardware returns garbage for the first sample of
a decoded picture is anyone's guess. The simplest reasonable way
to patch it up is to copy the first sample of the second line. This
should result in the correct chroma values (because the data was
original 4:2:0 upsampled to 4:2:2) even if the luma is isn't.

7 years agoavformat/matroskaenc: use display aspect ratio for DisplayWidth and DisplayHeight...
James Almer [Sat, 22 Oct 2016 18:56:28 +0000 (15:56 -0300)]
avformat/matroskaenc: use display aspect ratio for DisplayWidth and DisplayHeight when possible

This avoids potential rounding errors and guarantees the source aspect
ratio is preserved.
Keep writing pixel values when Stereo 3D Mode is enabled and for WebM,
as the format doesn't support anything else.

This fixes ticket #5743, implementing the suggestion from ticket #5903.

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavformat/matroskaenc: support writing Chroma Location elements
James Almer [Sat, 15 Oct 2016 14:17:37 +0000 (11:17 -0300)]
avformat/matroskaenc: support writing Chroma Location elements

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavformat/mpegtsenc: Add option to mark stream begin as discontinuous
Michael Niedermayer [Tue, 1 Nov 2016 23:51:52 +0000 (00:51 +0100)]
avformat/mpegtsenc: Add option to mark stream begin as discontinuous

This avoids continuity check failures in concatenated streams

Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolavc: Add hevc main10 profile to ffmpeg cli
Vittorio Giovara [Tue, 1 Nov 2016 23:17:37 +0000 (19:17 -0400)]
lavc: Add hevc main10 profile to ffmpeg cli

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/sunrast: Fix input buffer pointer check
Michael Niedermayer [Tue, 1 Nov 2016 18:24:49 +0000 (19:24 +0100)]
avcodec/sunrast: Fix input buffer pointer check

Fixes: out of array read
Fixes: poc.dat

Found-by: Bingchang, Liu @VARAS of IIE
Tested-by: bc L <l.bing.chang.bc@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agotests/fate/avformat: add segment.c tests
Rodger Combs [Thu, 27 Oct 2016 06:16:08 +0000 (01:16 -0500)]
tests/fate/avformat: add segment.c tests

7 years agolavf/matroskaenc: don't try to modify the header when live-streaming
Rodger Combs [Thu, 27 Oct 2016 06:10:47 +0000 (01:10 -0500)]
lavf/matroskaenc: don't try to modify the header when live-streaming

7 years agolavf/matroskaenc: fix uninitialized read
Rodger Combs [Thu, 27 Oct 2016 06:09:23 +0000 (01:09 -0500)]
lavf/matroskaenc: fix uninitialized read

7 years agolavf/segment: fix autobsf
Rodger Combs [Thu, 27 Oct 2016 03:03:02 +0000 (22:03 -0500)]
lavf/segment: fix autobsf

7 years agolavc/hapenc: Use the correct printf length modifier for size_t arguments.
Carl Eugen Hoyos [Wed, 2 Nov 2016 00:55:40 +0000 (01:55 +0100)]
lavc/hapenc: Use the correct printf length modifier for size_t arguments.

Fixes the following warning:
libavcodec/hapenc.c:122:20: warning: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘size_t’ [-Wformat]

Based on a patch by Diego Biurrun.

7 years agoRevert "img2 encoder: allow %t in filename, based on patch from Yuval Adam"
Michael Niedermayer [Tue, 1 Nov 2016 21:58:01 +0000 (22:58 +0100)]
Revert "img2 encoder: allow %t in filename, based on patch from Yuval Adam"

breaks API

Found-by: jamrial
This reverts commit 1a956c64c8eff5edecb004fc7aafd21207e6485c.

7 years agovf_colorspace: Add support for film primaries
Vittorio Giovara [Tue, 1 Nov 2016 21:36:50 +0000 (17:36 -0400)]
vf_colorspace: Add support for film primaries

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agovf_colorspace: Add support for smpte 431/432 (dci/display p3) primaries
Vittorio Giovara [Tue, 1 Nov 2016 21:38:13 +0000 (17:38 -0400)]
vf_colorspace: Add support for smpte 431/432 (dci/display p3) primaries

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agovf_colorspace: Add support for ycgco color space
Vittorio Giovara [Tue, 1 Nov 2016 21:37:23 +0000 (17:37 -0400)]
vf_colorspace: Add support for ycgco color space

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoimg2 encoder: use more descriptive vsync names
rogerdpack [Wed, 26 Oct 2016 00:33:30 +0000 (18:33 -0600)]
img2 encoder: use more descriptive vsync names

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoimg2 encoder: allow %t in filename, based on patch from Yuval Adam
rogerdpack [Wed, 26 Oct 2016 00:33:12 +0000 (18:33 -0600)]
img2 encoder: allow %t in filename, based on patch from Yuval Adam

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/dnxhdenc: Fix alignment of edge_buf*
Michael Niedermayer [Tue, 1 Nov 2016 01:31:10 +0000 (02:31 +0100)]
avcodec/dnxhdenc: Fix alignment of edge_buf*

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agofate: add streamcopy test for apng
Andreas Cadhalpun [Tue, 1 Nov 2016 16:36:47 +0000 (17:36 +0100)]
fate: add streamcopy test for apng

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoapngdec: use side data to pass extradata to the decoder
Andreas Cadhalpun [Tue, 1 Nov 2016 16:06:51 +0000 (17:06 +0100)]
apngdec: use side data to pass extradata to the decoder

Fixes remuxing apng streams coming from the apng demuxer.
This is a regression since 940b8908b94404a65f9f55e33efb4ccc6c81383c.

Found-by: James Almer <jamrial@gmail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agomov: immediately return from mov_fix_index without old index entries
Andreas Cadhalpun [Tue, 1 Nov 2016 00:05:01 +0000 (01:05 +0100)]
mov: immediately return from mov_fix_index without old index entries

If there are no index entries, e_old = st->index_entries is only one
byte large, since it was created by av_realloc called with size 0.

Thus accessing e_old[0].timestamp causes a heap buffer overflow.

Reviewed-by: Sasi Inguva <isasi@google.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoFix build warnings due to misleading indentation
Adriano Pallavicino [Tue, 1 Nov 2016 12:42:27 +0000 (13:42 +0100)]
Fix build warnings due to misleading indentation

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agofate filter metadata : add test for aphasemeter - Test a mono file (in phase) ->...
Martin Vignali [Mon, 24 Oct 2016 21:00:23 +0000 (23:00 +0200)]
fate filter metadata : add test for aphasemeter - Test a mono file (in phase) -> 1. as result - Test a out of phase 1000 Hz -> -1. as result

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolavfi/mergeplanes: Fix little endian yuv formats >8 bit and <16bit.
Carl Eugen Hoyos [Sat, 29 Oct 2016 22:39:19 +0000 (00:39 +0200)]
lavfi/mergeplanes: Fix little endian yuv formats >8 bit and <16bit.

Fixes remaining cases of ticket #5916.

7 years agolavfi/mergeplanes: Fix >8 bit for big endian formats and yuv4xxp16le.
Carl Eugen Hoyos [Sat, 29 Oct 2016 22:25:12 +0000 (00:25 +0200)]
lavfi/mergeplanes: Fix >8 bit for big endian formats and yuv4xxp16le.

Fixes part of ticket #5916.

7 years agolavf/mov: Only search for invalid moov in free if compliance < STRICT.
Carl Eugen Hoyos [Tue, 1 Nov 2016 10:31:39 +0000 (11:31 +0100)]
lavf/mov: Only search for invalid moov in free if compliance < STRICT.

7 years agointerplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE
Andreas Cadhalpun [Sun, 30 Oct 2016 20:18:20 +0000 (21:18 +0100)]
interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE

This fixes out-of-bounds reads by the bitstream reader.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoavcodec/smc: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/smc:  Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/tscc: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/tscc:  Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/rscc: Fix constant
Michael Niedermayer [Mon, 31 Oct 2016 22:01:09 +0000 (23:01 +0100)]
avcodec/rscc: Fix constant

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agovf_colorspace: Add support for iec61966-2.4 (xvYCC) transfer
Vittorio Giovara [Sun, 30 Oct 2016 07:07:44 +0000 (03:07 -0400)]
vf_colorspace: Add support for iec61966-2.4 (xvYCC) transfer

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/qsv: remove MFX_EXTBUFF_CODING_OPTION3
Kyle Schwarz [Sat, 18 Jun 2016 04:33:12 +0000 (00:33 -0400)]
avcodec/qsv: remove MFX_EXTBUFF_CODING_OPTION3

4th generation Intel CPUs don't support MFX_EXTBUFF_CODING_OPTION3.

This patch fixes bug #5324.

7 years agoqsvdec: Avoid probing with qsv decoders
Mark Thompson [Sat, 29 Oct 2016 20:26:40 +0000 (21:26 +0100)]
qsvdec: Avoid probing with qsv decoders

Set the AV_CODEC_CAP_AVOID_PROBING flag on all of the qsv decoders.

7 years agoqsv: Merge libav implementation
Mark Thompson [Fri, 21 Oct 2016 17:57:12 +0000 (18:57 +0100)]
qsv: Merge libav implementation

Merged as-at libav 398f015, and therefore includes outstanding
skipped merges 04b17ff and 130e1f1.

All features not in libav are preserved, and no options change.

7 years agompegvideo: Return correct coded frame sizes from parser
Mark Thompson [Wed, 26 Oct 2016 19:28:18 +0000 (20:28 +0100)]
mpegvideo: Return correct coded frame sizes from parser

7 years agohevc: Return stream format information from parser
Mark Thompson [Wed, 26 Oct 2016 19:27:57 +0000 (20:27 +0100)]
hevc: Return stream format information from parser

7 years agovc1: Return stream format information from parser
Mark Thompson [Sun, 23 Oct 2016 17:42:22 +0000 (18:42 +0100)]
vc1: Return stream format information from parser

7 years agolavf/mov.c: Use the correct timescale when seeking for audio.
Sasi Inguva [Mon, 24 Oct 2016 05:37:50 +0000 (22:37 -0700)]
lavf/mov.c: Use the correct timescale when seeking for audio.

Signed-off-by: Sasi Inguva <isasi@google.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agoconfigure: add '-uninstalled' to uninstalled .pc files
Reynaldo H. Verdejo Pinochet [Fri, 28 Oct 2016 19:48:54 +0000 (12:48 -0700)]
configure: add '-uninstalled' to uninstalled .pc files

pkg-config(1) expects uninstalled pc files to follow the
blah-uninstalled.pc naming convention and the behavior
of the program is impacted by it. Without this fix
overriding PKGP_CONFIG_LIBDIR is required to ensure
uninstalled files are preferred (overkill), instead of
just adding pc-uninstalled/ to the utility's search path
by setting PKG_CONFIG_PATH accordingly.

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
7 years agoavcodec/rawdec: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/rawdec: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/rscc: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/rscc: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/msvideo1: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/msvideo1: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/qpeg: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/qpeg:  Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/qtrle: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/qtrle:  Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/msrle: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/msrle:  Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/cuvid: Don't claim to decode h.263 (it doesn't)
Philip Langdale [Sun, 30 Oct 2016 17:30:27 +0000 (10:30 -0700)]
avcodec/cuvid: Don't claim to decode h.263 (it doesn't)

Turns out cuvid doesn't support h.263.

7 years agointerplayacm: validate number of channels
Andreas Cadhalpun [Sun, 30 Oct 2016 20:41:11 +0000 (21:41 +0100)]
interplayacm: validate number of channels

The number of channels is used as divisor in decode_frame, so it must
not be zero to avoid SIGFPE crashes.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agointerplayacm: check for too large b
Andreas Cadhalpun [Sun, 30 Oct 2016 19:47:22 +0000 (20:47 +0100)]
interplayacm: check for too large b

This fixes out-of-bounds reads.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoavcodec/kmvc: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/kmvc:  Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/idcinvideo: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 14:12:12 +0000 (15:12 +0100)]
avcodec/idcinvideo: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoopenssl: Allow newer TLS versions than TLSv1
Mark Thompson [Fri, 28 Oct 2016 18:50:27 +0000 (19:50 +0100)]
openssl: Allow newer TLS versions than TLSv1

The use of TLSv1_*_method() disallows newer protocol versions; instead
use SSLv23_*_method() and then explicitly disable the deprecated
protocol versions which should not be supported.

Fixes ticket #5915.

7 years agoavcodec/cinepak: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 12:47:38 +0000 (13:47 +0100)]
avcodec/cinepak: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/8bps: Check side data size before use
Michael Niedermayer [Sun, 30 Oct 2016 12:44:52 +0000 (13:44 +0100)]
avcodec/8bps: Check side data size before use

Fixes out of array read

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc: fix spelling errors
Andreas Cadhalpun [Sat, 29 Oct 2016 14:55:14 +0000 (16:55 +0200)]
doc: fix spelling errors

Reviewed-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoconfigure: add missing fork() dependency to http_multiclient example
James Almer [Sat, 29 Oct 2016 17:45:22 +0000 (14:45 -0300)]
configure: add missing fork() dependency to http_multiclient example

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavfilter/avf_showcqt: add bar_t option
Muhammad Faiz [Fri, 28 Oct 2016 05:55:04 +0000 (12:55 +0700)]
avfilter/avf_showcqt: add bar_t option

custom bargraph transparency

Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
7 years agocrystalhd: Reorder mspeg4 decoder after software decoders
Philip Langdale [Fri, 28 Oct 2016 01:39:49 +0000 (18:39 -0700)]
crystalhd: Reorder mspeg4 decoder after software decoders

This avoids it getting picked by default, which is generally
undesirable and can break test runs.

7 years agoconfigure: make sure LTO does not optimize out the test functions
Andreas Cadhalpun [Tue, 25 Oct 2016 17:09:46 +0000 (19:09 +0200)]
configure: make sure LTO does not optimize out the test functions

Fixes trac ticket #5909

Bud-Id: https://bugs.gentoo.org/show_bug.cgi?id=598054
Acked-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agofate: add apng encoding/muxing test
Andreas Cadhalpun [Thu, 27 Oct 2016 23:38:51 +0000 (01:38 +0200)]
fate: add apng encoding/muxing test

Also test the fallback to png creation for a single frame.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoavformat/flvdec: Fix regression loosing streams
Michael Niedermayer [Fri, 28 Oct 2016 10:18:35 +0000 (12:18 +0200)]
avformat/flvdec: Fix regression loosing streams

Fixes: unknown_video.flv

Found-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoapng: use side data to pass extradata to muxer
Andreas Cadhalpun [Thu, 27 Oct 2016 20:34:48 +0000 (22:34 +0200)]
apng: use side data to pass extradata to muxer

This fixes creating apng files, which is broken since commit
5ef19590802f000299e418143fc2301e3f43affe.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
7 years agoavisynth: fix Planar RGB output
Stephen Hutchinson [Wed, 31 Aug 2016 00:26:08 +0000 (20:26 -0400)]
avisynth: fix Planar RGB output

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolavfi/vf_overlay: support NV12 and NV21
Rodger Combs [Tue, 25 Oct 2016 06:28:43 +0000 (01:28 -0500)]
lavfi/vf_overlay: support NV12 and NV21

Tested-by: Michael on x86-32/64 linux, mingw, mips/arm qemu linux
7 years agoavcodec: remove missing incompatible_libav_abi references
James Almer [Wed, 26 Oct 2016 20:36:12 +0000 (17:36 -0300)]
avcodec: remove missing incompatible_libav_abi references

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoconfigure: remove missing incompatible_libav_abi references
James Almer [Wed, 26 Oct 2016 20:36:07 +0000 (17:36 -0300)]
configure: remove missing incompatible_libav_abi references

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavformat/matroskaenc: fix cue relative position values when CRC32 is enabled
James Almer [Tue, 25 Oct 2016 15:12:03 +0000 (12:12 -0300)]
avformat/matroskaenc: fix cue relative position values when CRC32 is enabled

The dynamic buffer does not contain the CRC32 element so calls to avio_tell()
don't take it into account. This resulted in CueRelativePosition values being
six bytes short.
This is a regression since 6724525a1576ca334d2ffdc085620bb44aea7394

Instead of adding yet another custom check for CRC32 to fix a size or an offset,
remove the existing ones and reserve the six bytes in the dynamic buffer.

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoRELEASE: Update for past 3.2 branch
Michael Niedermayer [Wed, 26 Oct 2016 18:51:20 +0000 (20:51 +0200)]
RELEASE: Update for past 3.2 branch

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoChangelog: Add back next marker
Michael Niedermayer [Wed, 26 Oct 2016 18:50:19 +0000 (20:50 +0200)]
Changelog: Add back next marker

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoBump minor versions after 3.2 branchpoint to seperate release
Michael Niedermayer [Wed, 26 Oct 2016 18:49:24 +0000 (20:49 +0200)]
Bump minor versions after 3.2 branchpoint to seperate release

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoChangelog: Add 3.2
Michael Niedermayer [Wed, 26 Oct 2016 18:46:53 +0000 (20:46 +0200)]
Changelog: Add 3.2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/APIchanges: add 3.2 Cut marker
Michael Niedermayer [Wed, 26 Oct 2016 18:43:43 +0000 (20:43 +0200)]
doc/APIchanges: add 3.2 Cut marker

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoBump minor versions for 3.2
Michael Niedermayer [Wed, 26 Oct 2016 18:42:27 +0000 (20:42 +0200)]
Bump minor versions for 3.2

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoRevert "avformat/utils: Discard huge timestamps which would cause overflows if used...
Michael Niedermayer [Wed, 26 Oct 2016 18:31:04 +0000 (20:31 +0200)]
Revert "avformat/utils: Discard huge timestamps which would cause overflows if used in basic computations"

Some people seem to oppose this the patch seems to have been missed for a month on the ML
lets restart the discussion and solve this after the release

This reverts commit e936c8d176efd1a0a41e22df24564b1178c79ea9.

7 years agoavcodec/dvdsubdec: Fix off by 1 error
Michael Niedermayer [Tue, 25 Oct 2016 22:11:52 +0000 (00:11 +0200)]
avcodec/dvdsubdec: Fix off by 1 error

Fixes out of array read

Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/utils: Discard huge timestamps which would cause overflows if used in basic...
Michael Niedermayer [Sun, 25 Sep 2016 20:21:53 +0000 (22:21 +0200)]
avformat/utils: Discard huge timestamps which would cause overflows if used in basic computations

Allowing larger timestamps makes it impossible to calculate basic things like the
difference of 2 timestamps or their sum without checking each individual computation for
overflow.
This should avoid a significant number of overflow checks

Fixes Ticket5136

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/isom: Fix old API regression with exporting max bitrate
Michael Niedermayer [Mon, 10 Oct 2016 00:06:12 +0000 (02:06 +0200)]
avformat/isom: Fix old API regression with exporting max bitrate

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/patchwork: Document the patchwork states
Michael Niedermayer [Sat, 22 Oct 2016 11:37:57 +0000 (13:37 +0200)]
doc/patchwork: Document the patchwork states

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolavu: remove comma at final enumeration items to fix pedantic warnings
Michael Behrisch [Thu, 20 Oct 2016 06:48:25 +0000 (08:48 +0200)]
lavu: remove comma at final enumeration items to fix pedantic warnings

7 years agoswresample/rematrix: Fix float part of swr_set_matrix()
Vodyannikov Aleksandr [Thu, 20 Oct 2016 03:57:35 +0000 (06:57 +0300)]
swresample/rematrix: Fix float part of swr_set_matrix()

Fixes Ticket #5897.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoconfigure: Remove --enable-incompatible-libav-abi from the help output
Michael Niedermayer [Wed, 26 Oct 2016 17:07:01 +0000 (19:07 +0200)]
configure: Remove --enable-incompatible-libav-abi from the help output

As it does not work anymore since 655b6dcb34b25d591e15ede17673ea6cb8074711

Found-by: carl
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/dvdsubdec: Fix buf_size check
Michael Niedermayer [Wed, 26 Oct 2016 14:29:57 +0000 (16:29 +0200)]
avcodec/dvdsubdec: Fix buf_size check

Fixes out of array access

Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/APIchanges: Fill in some missing things
Michael Niedermayer [Wed, 26 Oct 2016 00:57:51 +0000 (02:57 +0200)]
doc/APIchanges: Fill in some missing things

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolavf/flvdec: init AVPacket::pos to FLVTAG offset
Suman- [Tue, 18 Oct 2016 22:13:23 +0000 (15:13 -0700)]
lavf/flvdec: init AVPacket::pos to FLVTAG offset

Current code doesn't initialize AVPacket::pos. Made it point to FLVTAG so flv_read_packet can decode from pos

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agofate: Add MXF D10/DNXHD/DV25 probe tests
Tobias Rapp [Tue, 25 Oct 2016 08:06:15 +0000 (10:06 +0200)]
fate: Add MXF D10/DNXHD/DV25 probe tests

Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter/scale_npp: fix passthrough mode
Yogender Gupta [Mon, 24 Oct 2016 12:32:01 +0000 (18:02 +0530)]
avfilter/scale_npp: fix passthrough mode

Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolavc/utvideoenc: Set bits_per_coded_sample for rgba.
Carl Eugen Hoyos [Tue, 25 Oct 2016 11:44:08 +0000 (13:44 +0200)]
lavc/utvideoenc: Set bits_per_coded_sample for rgba.

Allows to write correct value for biBitCount into BITMAPINFOHEADER.
Before, ff_put_bmp_header() always wrote "24" as biBitCount
for utvideo because bits_per_coded_sample was never set by the
encoder.