ffmpeg.git
4 years agoavformat/mov: merge mov_read_custom functions
Marton Balint [Sat, 20 Feb 2016 00:34:42 +0000 (01:34 +0100)]
avformat/mov: merge mov_read_custom functions

This also fixes reading gapless metadata when the entries do not start with the
mean atom. Such samples can be found here:
https://hydrogenaud.io/index.php/topic,93310.0.html

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavformat/dashenc: Enable dash output to work when the output isn't a local file
Raymond Hilseth [Wed, 6 Jan 2016 08:57:41 +0000 (09:57 +0100)]
avformat/dashenc: Enable dash output to work when the output isn't a local file

Use avpriv_io_move instead of ff_rename to support more than only
the file protocol.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/file: enable file_move() without unistd.h
Raymond Hilseth [Wed, 6 Jan 2016 08:57:41 +0000 (09:57 +0100)]
avformat/file: enable file_move() without unistd.h

it only requires the rename function from os_support.h.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216
Rodger Combs [Tue, 23 Feb 2016 00:34:01 +0000 (18:34 -0600)]
lavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216

4 years agolavf/mov: fix sidx with edit lists
Rodger Combs [Thu, 18 Feb 2016 18:57:37 +0000 (12:57 -0600)]
lavf/mov: fix sidx with edit lists

4 years agovc2enc: redistribute leftover bytes
Rostislav Pehlivanov [Sat, 27 Feb 2016 18:40:17 +0000 (18:40 +0000)]
vc2enc: redistribute leftover bytes

This commit redistributes the leftover bytes amongst the top 150 slices
in terms of size (in the hopes that they'll be the ones pretty bitrate
starved).

A more perceptual method would probably need to cut bits off from slices
which don't need much, but that'll be implemented later.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: allocate the DWT context with the current plane size
Rostislav Pehlivanov [Sat, 27 Feb 2016 18:39:32 +0000 (18:39 +0000)]
vc2enc: allocate the DWT context with the current plane size

Previously used the luma size only.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years ago2enc: clip and warn when user bitrate set too low
Rostislav Pehlivanov [Sun, 28 Feb 2016 19:05:15 +0000 (19:05 +0000)]
2enc: clip and warn when user bitrate set too low

The encoder crashed on verly low bitrates since there wasn't enough
space allocated.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: clip and warn when user bitrate set too low
Rostislav Pehlivanov [Sat, 27 Feb 2016 18:38:09 +0000 (18:38 +0000)]
vc2enc: clip and warn when user bitrate set too low

The encoder crashed on verly low bitrates since there wasn't enough
space allocated.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: carry over quantization index across frames as a starting point
Rostislav Pehlivanov [Sat, 27 Feb 2016 18:34:03 +0000 (18:34 +0000)]
vc2enc: carry over quantization index across frames as a starting point

Previously a global average was used. Using the previous quantizer
resulted in a fairly significant speedup as slice size selection settled
down quicker.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: use 32 bits for quantized coefficients LUT
Rostislav Pehlivanov [Sat, 27 Feb 2016 18:27:18 +0000 (18:27 +0000)]
vc2enc: use 32 bits for quantized coefficients LUT

16 bits were definitely not enough and caused artifacts to appear on
images at barely compressed images.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: cache bits per quantizer, calculate wasted bits
Rostislav Pehlivanov [Sat, 27 Feb 2016 18:24:28 +0000 (18:24 +0000)]
vc2enc: cache bits per quantizer, calculate wasted bits

Needed for following commits, also a speed increase.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoavfilter/vf_vectorscope: add color5 mode, mode like color but with higher saturation
Paul B Mahol [Sun, 28 Feb 2016 18:20:50 +0000 (19:20 +0100)]
avfilter/vf_vectorscope: add color5 mode, mode like color but with higher saturation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec/mjpegdec: Fix decoding slightly odd progressive jpeg
Michael Niedermayer [Sun, 28 Feb 2016 17:10:23 +0000 (18:10 +0100)]
avcodec/mjpegdec: Fix decoding slightly odd progressive jpeg

Fixes: ebd58db6-dc86-11e5-91c2-59daeddf50c7.jpg

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoLICENSE: Thorough editing
Timothy Gu [Sun, 24 Jan 2016 17:17:36 +0000 (09:17 -0800)]
LICENSE: Thorough editing

The changes in "Incompatible libraries" section are strictly based on
what our configure script says.

4 years agox86/vf_blend: Add SSE2 optimization for divide
Timothy Gu [Wed, 10 Feb 2016 09:04:51 +0000 (09:04 +0000)]
x86/vf_blend: Add SSE2 optimization for divide

 4.5x faster than C float version with autovectorization
10  x faster than C int version
25  x faster than C float version without autovectorization

4 years agolavf/mp3: Properly check return values of seeks and reads while reading the header
Derek Buitenhuis [Fri, 26 Feb 2016 17:10:08 +0000 (17:10 +0000)]
lavf/mp3: Properly check return values of seeks and reads while reading the header

Fixes large amounts of seeking past EOF, which could be extremely
slow over a network.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoavformat/Makefile: Fixed missing rawutils.o reference (required by movenc.c)
Roman Ryltsov [Sun, 28 Feb 2016 13:32:15 +0000 (14:32 +0100)]
avformat/Makefile: Fixed missing rawutils.o reference (required by movenc.c)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoDocument and validate AVFrame plane pointers.
Reimar Döffinger [Fri, 26 Feb 2016 17:38:19 +0000 (18:38 +0100)]
Document and validate AVFrame plane pointers.

Check that the required plane pointers and only
those are set up.
Currently does not enforce anything for the palette
pointer of pseudopal formats as I am unsure about the
requirements.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agomjpegdec: Do not assume unused plane pointer are NULL.
Reimar Döffinger [Thu, 25 Feb 2016 23:11:12 +0000 (00:11 +0100)]
mjpegdec: Do not assume unused plane pointer are NULL.

We do neither document nor check such a requirement
and for application-provided get_buffer2 they could
contain the result of a malloc(0) or whatever value
they had previously.
This fixes a use-after-free in e.g. MPlayer:
https://trac.mplayerhq.hu/ticket/2262
We might want to consider changing the (documented)
API in addition though.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agomss2: Fix buffer overflow.
Reimar Döffinger [Thu, 25 Feb 2016 20:04:36 +0000 (21:04 +0100)]
mss2: Fix buffer overflow.

Reported as https://trac.mplayerhq.hu/ticket/2264 but have
not been able to reproduce with FFmpeg-only.
I have no idea what coded_height is used for here exactly,
so this might not be the best fix.
Fixes the following chain of events:
ff_mss12_decode_init sets coded_height while not setting height.
ff_mpv_decode_init then copies coded_height into MpegEncContext height.
This is then used by init_context_frame to allocate the data structures.
However the wmv9rects are validated/initialized based on avctx->height, not
avctx->coded_height.
Thus the decode_wmv9 function will try to decode a larger video that we
allocated data structures for, causing out-of-bounds writes.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
4 years agotests/lavf-regression: Add mp4 timecode test
Michael Niedermayer [Sun, 28 Feb 2016 02:54:50 +0000 (03:54 +0100)]
tests/lavf-regression: Add mp4 timecode test

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomovenc: Timecode in MP4 Although MP4 does not have a concrete specification to store...
Syed Andaleeb Roomy [Thu, 21 Jan 2016 06:08:09 +0000 (07:08 +0100)]
movenc: Timecode in MP4 Although MP4 does not have a concrete specification to store timecode information, the following technical note from Apple describes a way to achieve this via timecode track, similar to how it is done for MOV files.

https://developer.apple.com/library/mac/technotes/tn2174/_index.html

- Enabled creation of timecode tracks for MP4 in the same way as MOV.
- Used nmhd as media information header of timecode track of MP4 instead
  of gmhd used in MOV, thus avoiding tcmi also, as recommended above.
- Bypassed adding source reference field for MP4, as suggested above.

Issue: https://trac.ffmpeg.org/ticket/4704

Signed-off-by: Syed Andaleeb Roomy <andaleebcse@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: add direct detection of libopencv
Andreas Cadhalpun [Sun, 7 Feb 2016 22:25:53 +0000 (23:25 +0100)]
configure: add direct detection of libopencv

The pkg-config file contains all opencv libraries, not only the
neccessary ones.

This change makes it possible to use the libopencv-imgproc-dev Debian
package instead of libopencv-dev, saving about 200 MB of useless
build-dependencies.

In particular one doesn't need to install the parts of opencv that
depend on ffmpeg libraries.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/imgutils: Assert that the 2nd av_image_fill_linesizes() call in av_image_fill_...
Michael Niedermayer [Wed, 3 Feb 2016 16:07:26 +0000 (17:07 +0100)]
avutil/imgutils: Assert that the 2nd av_image_fill_linesizes() call in av_image_fill_linesizes() still succeeds

Fixes CID1271742

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/aac_ac3_parser: reindent
Rodger Combs [Wed, 25 Nov 2015 20:53:06 +0000 (14:53 -0600)]
lavc/aac_ac3_parser: reindent

4 years agolavc/aac_ac3_parser: avoid zeroing codec parameters if we haven't read a frame
Rodger Combs [Tue, 24 Nov 2015 09:20:09 +0000 (03:20 -0600)]
lavc/aac_ac3_parser: avoid zeroing codec parameters if we haven't read a frame

This caused issues when seeking in some unusual MPEGTS files

4 years agoprobe TrueHD in MPEGTS
Rodger Combs [Tue, 17 Nov 2015 16:01:01 +0000 (10:01 -0600)]
probe TrueHD in MPEGTS

4 years agolavc/Makefile: dnxhd demuxer depends on dnxhddata.o
Rodger Combs [Wed, 24 Feb 2016 22:59:41 +0000 (16:59 -0600)]
lavc/Makefile: dnxhd demuxer depends on dnxhddata.o

4 years agovf_copy: exclude hwaccel formats
wm4 [Fri, 26 Feb 2016 22:37:33 +0000 (23:37 +0100)]
vf_copy: exclude hwaccel formats

This does obviously not work.

(Additions based on vf_crop.c.)

4 years agoavfilter/avf_showwolume: add orientation and step option
Paul B Mahol [Sat, 27 Feb 2016 16:27:23 +0000 (17:27 +0100)]
avfilter/avf_showwolume: add orientation and step option

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavfi/ass: fix version check for sub_text_format option
Clément Bœsch [Sat, 27 Feb 2016 15:26:10 +0000 (16:26 +0100)]
lavfi/ass: fix version check for sub_text_format option

4 years agoavcodec/cfhd: Add support for 12-bit RGBA.
Kieran Kunhya [Sat, 27 Feb 2016 13:17:20 +0000 (13:17 +0000)]
avcodec/cfhd: Add support for 12-bit RGBA.

Plays all known samples

4 years agocfhd: reallocate internal buffers on format change.
Kieran Kunhya [Mon, 15 Feb 2016 21:39:27 +0000 (21:39 +0000)]
cfhd: reallocate internal buffers on format change.

Fixes some, but not all, of the threading fuzz crashes

4 years agoavcodec/utils: Check that the video data[] arrays are NULL on the input to get_buffer...
Michael Niedermayer [Fri, 26 Feb 2016 11:59:08 +0000 (12:59 +0100)]
avcodec/utils: Check that the video data[] arrays are NULL on the input to get_buffer_internal()

This should return an error to the decoder if the struct it tried to getbuffer is dirty

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/utils: Check all data[] pointers in video_get_buffer() not just the first
Michael Niedermayer [Fri, 26 Feb 2016 11:59:07 +0000 (12:59 +0100)]
avcodec/utils: Check all data[] pointers in video_get_buffer() not just the first

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agosws/yuv2rgb: clarify precision of coeff and offset for mmx code
Clément Bœsch [Fri, 26 Feb 2016 21:34:10 +0000 (22:34 +0100)]
sws/yuv2rgb: clarify precision of coeff and offset for mmx code

It makes easier looking at the difference with the generic code just
below.

4 years agosws/yuv2rgb: avoid a few ub on signed left shifts
Clément Bœsch [Fri, 26 Feb 2016 21:32:04 +0000 (22:32 +0100)]
sws/yuv2rgb: avoid a few ub on signed left shifts

4 years agomips: do not disable any feature for generic cores
Vicente Olivert Riera [Wed, 24 Feb 2016 16:38:21 +0000 (16:38 +0000)]
mips: do not disable any feature for generic cores

We don't know which features are available when the user selects a
generic core, so don't disable anything by default and let the user
decide.

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agomips: improve detection of ISAs, FPU and ASEs (DSP, MSA)
Vicente Olivert Riera [Wed, 24 Feb 2016 16:38:20 +0000 (16:38 +0000)]
mips: improve detection of ISAs, FPU and ASEs (DSP, MSA)

Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/matroskadec: Process QuickTime palette per track
Mats Peterson [Wed, 24 Feb 2016 17:14:05 +0000 (18:14 +0100)]
lavf/matroskadec: Process QuickTime palette per track

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavf/movenc: Add palette to video sample description
Mats Peterson [Fri, 26 Feb 2016 04:07:28 +0000 (05:07 +0100)]
lavf/movenc: Add palette to video sample description

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter: add datascope filter
Paul B Mahol [Tue, 23 Feb 2016 21:41:07 +0000 (22:41 +0100)]
avfilter: add datascope filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavc: reindent a few decoders after previous commits
Clément Bœsch [Fri, 26 Feb 2016 21:15:20 +0000 (22:15 +0100)]
lavc: reindent a few decoders after previous commits

4 years agolavc: deprecate decoded ass subtitles with timings
Clément Bœsch [Sun, 21 Feb 2016 11:58:36 +0000 (12:58 +0100)]
lavc: deprecate decoded ass subtitles with timings

4 years agolavfi/ass: use ass_process_chunk() instead of ass_process_data()
Clément Bœsch [Sun, 21 Feb 2016 11:41:49 +0000 (12:41 +0100)]
lavfi/ass: use ass_process_chunk() instead of ass_process_data()

4 years agoffmpeg: set sub_text_format to ass (without timing) by default
Clément Bœsch [Sun, 21 Feb 2016 11:02:07 +0000 (12:02 +0100)]
ffmpeg: set sub_text_format to ass (without timing) by default

Fixes Ticket #4783

4 years agolavc/options: add ass_ro_flush_noop to flags2
Clément Bœsch [Sat, 20 Feb 2016 20:27:45 +0000 (21:27 +0100)]
lavc/options: add ass_ro_flush_noop to flags2

4 years agolavc: allow subtitle text format to be ASS without timing
Clément Bœsch [Wed, 6 Jan 2016 12:43:23 +0000 (13:43 +0100)]
lavc: allow subtitle text format to be ASS without timing

4 years agoKill timed SSA
Clément Bœsch [Sun, 14 Sep 2014 18:55:36 +0000 (20:55 +0200)]
Kill timed SSA

4 years agofate: Add test for packed mp3 in mp4 demuxing
Michael Niedermayer [Thu, 25 Feb 2016 02:00:47 +0000 (03:00 +0100)]
fate: Add test for packed mp3 in mp4 demuxing

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/utils: Merge identical if conditions
Michael Niedermayer [Fri, 26 Feb 2016 11:59:38 +0000 (12:59 +0100)]
avcodec/utils: Merge identical if conditions

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovc2enc: calculate the minimum slice size only once
Rostislav Pehlivanov [Fri, 26 Feb 2016 15:38:26 +0000 (15:38 +0000)]
vc2enc: calculate the minimum slice size only once

This commit moves the minimum bits per slice calculations outside of the
rate control function as it is identical for every slice.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: halve allocated table size, refactor and optimize quantization
Rostislav Pehlivanov [Fri, 26 Feb 2016 14:47:06 +0000 (14:47 +0000)]
vc2enc: halve allocated table size, refactor and optimize quantization

Since coefficients differ only in the last bit when writing to the
bitstream it was possible to remove the sign from the tables, thus
halving them. Also now all quantization is done in the unsigned domain
as the sign is completely separate, which gets rid of the need to do
quantization on 32 bit signed integers.

Overall, this slightly speeds up the encoder depending on the machine.
The commit still generates bit-identical files as before the commit.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: use FFABS() instead of abs()
Rostislav Pehlivanov [Fri, 26 Feb 2016 12:54:15 +0000 (12:54 +0000)]
vc2enc: use FFABS() instead of abs()

Provides a minor speedup.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: correctly zero out coefficient array padding
Rostislav Pehlivanov [Fri, 26 Feb 2016 12:21:36 +0000 (12:21 +0000)]
vc2enc: correctly zero out coefficient array padding

Credit for figuring this out goes to James Darnley.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agovc2enc: mark as FF_CODEC_CAP_INIT_THREADSAFE and align AVCodec entries
Rostislav Pehlivanov [Fri, 26 Feb 2016 12:16:25 +0000 (12:16 +0000)]
vc2enc: mark as FF_CODEC_CAP_INIT_THREADSAFE and align AVCodec entries

The encoder does not modify any global variables.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
4 years agoavfilter/af_astats: do not clear previous sample value
Paul B Mahol [Fri, 26 Feb 2016 09:35:19 +0000 (10:35 +0100)]
avfilter/af_astats: do not clear previous sample value

Should help when using reset=1 and metadata=1

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavf/mux: do not fail in case of non strictly monotonically increasing DTS values...
Stefano Sabatini [Thu, 17 Dec 2015 19:51:42 +0000 (20:51 +0100)]
lavf/mux: do not fail in case of non strictly monotonically increasing DTS values for data packets

Consistent with what we already do with subtitles since ac08c5c0adcb7f2f9b5ea3eb473d1c2b9659aab2.

4 years agolavf/img2dec: Skip SOF size when probing jpeg.
Carl Eugen Hoyos [Fri, 26 Feb 2016 08:53:29 +0000 (09:53 +0100)]
lavf/img2dec: Skip SOF size when probing jpeg.

Fixes auto-detection for some resolutions.
Reported-by: Clément Bœsch
4 years agoconfigure: only check dispatch header on darwin
Matthieu Bouron [Thu, 25 Feb 2016 14:00:59 +0000 (15:00 +0100)]
configure: only check dispatch header on darwin

Fixes build of lavd/jack on linux if dispatch happens to be available on
this platform. dispatch, as well as its dependencies kqueue and pwq are
generally not installed / distribued on linux systems. If it happens to
be the case, you want to explicitely link against the libraries (using
-ldispatch) as opposed to darwin where it is part of the standard
library and -ldispatch doesn't work.

4 years agoMAINTAINERS: remove myself as a server maintainer
Lou Logan [Fri, 26 Feb 2016 03:10:48 +0000 (18:10 -0900)]
MAINTAINERS: remove myself as a server maintainer

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agoconfigure: add missing --strip option to show_help()
Matthieu Bouron [Wed, 24 Feb 2016 10:40:12 +0000 (11:40 +0100)]
configure: add missing --strip option to show_help()

4 years agolavc/mjpegdec: Fix decoding images with Adobe_CM tag.
Carl Eugen Hoyos [Thu, 25 Feb 2016 12:26:13 +0000 (13:26 +0100)]
lavc/mjpegdec: Fix decoding images with Adobe_CM tag.

Fixes ticket #5267.

4 years agodoc/filters: Fix idet option name "rep_thres".
Carl Eugen Hoyos [Thu, 25 Feb 2016 12:22:46 +0000 (13:22 +0100)]
doc/filters: Fix idet option name "rep_thres".

Reported by forum user vovcheck.

4 years agoavfilter/hwupload_cuda: Add missing semicolon.
Matt Oliver [Thu, 25 Feb 2016 02:00:52 +0000 (13:00 +1100)]
avfilter/hwupload_cuda: Add missing semicolon.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
4 years agolibavcodec:add packet level support for mastering metadata
Neil Birkbeck [Mon, 22 Feb 2016 22:53:06 +0000 (14:53 -0800)]
libavcodec:add packet level support for mastering metadata

Some containers, like webm/mkv, will contain this mastering metadata.
This is analogous to the way 3D fpa data is handled (in frame and
packet side data).

Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/drawutils: fix gray and gbr formats on big endian
Michael Niedermayer [Wed, 24 Feb 2016 22:21:14 +0000 (23:21 +0100)]
avfilter/drawutils: fix gray and gbr formats on big endian

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/drawutils: Fix ff_fill_rectangle() on big endian
Michael Niedermayer [Wed, 24 Feb 2016 22:11:54 +0000 (23:11 +0100)]
avfilter/drawutils: Fix ff_fill_rectangle() on big endian

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/af_astats: clear all stats
Paul B Mahol [Wed, 24 Feb 2016 23:00:25 +0000 (00:00 +0100)]
avfilter/af_astats: clear all stats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/af_astats: reset stats prior not after filtering
Paul B Mahol [Wed, 24 Feb 2016 21:10:32 +0000 (22:10 +0100)]
avfilter/af_astats: reset stats prior not after filtering

This way stats printed at uninit are also useful.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoRevert "Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'"
Michael Niedermayer [Wed, 24 Feb 2016 19:42:25 +0000 (20:42 +0100)]
Revert "Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'"

This broke packed_maindata.mp3.mp4
Its unknown to me what this commit would have fixed

Reviewed-by: James Almer <jamrial@gmail.com>
This reverts commit 79127dbbeffa87243c92af2befc09ad63bcbd1a1, reversing
changes made to 9fad1ce7c95adeec440f51af77f730340a6d27b8.

4 years agoconfigure: add missing vc1dsp dependency to vc1_decoder
James Almer [Wed, 24 Feb 2016 18:49:51 +0000 (15:49 -0300)]
configure: add missing vc1dsp dependency to vc1_decoder

Fixes compilation of vc1_decoder when vc1_parser is not enabled

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavfilter/vf_blend: add freeze and heat modes
Paul B Mahol [Wed, 24 Feb 2016 18:28:35 +0000 (19:28 +0100)]
avfilter/vf_blend: add freeze and heat modes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoMerge commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49'
Derek Buitenhuis [Wed, 24 Feb 2016 18:27:00 +0000 (18:27 +0000)]
Merge commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49'

This commit is a no-op. We already do this.

* commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49':
  matroska: Always consider S_TEXT/UTF8 as SRT when demuxing

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8caadfc53ddc55a269722ada65294f0ea8b609ac'
Derek Buitenhuis [Wed, 24 Feb 2016 18:25:27 +0000 (18:25 +0000)]
Merge commit '8caadfc53ddc55a269722ada65294f0ea8b609ac'

* commit '8caadfc53ddc55a269722ada65294f0ea8b609ac':
  fate: Be silent when switching to Git branch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '8d918a98aa24134a043d578ef45bae363dbed9db'
Derek Buitenhuis [Wed, 24 Feb 2016 18:24:34 +0000 (18:24 +0000)]
Merge commit '8d918a98aa24134a043d578ef45bae363dbed9db'

* commit '8d918a98aa24134a043d578ef45bae363dbed9db':
  rtpdec: Use the right logging context

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'
Derek Buitenhuis [Wed, 24 Feb 2016 18:23:36 +0000 (18:23 +0000)]
Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'

* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9':
  build: Disentangle VC-1 decoder and parser

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c'
Derek Buitenhuis [Wed, 24 Feb 2016 18:21:38 +0000 (18:21 +0000)]
Merge commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c'

* commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c':
  build: Add vc1dsp component for more fine-grained dependencies

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'
Derek Buitenhuis [Wed, 24 Feb 2016 18:15:14 +0000 (18:15 +0000)]
Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'

* commit 'f9fbd474676e903e12efe83203697d60a9d28cf9':
  msmpeg4data: Move WMV2 data tables to their own file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4'
Derek Buitenhuis [Wed, 24 Feb 2016 18:13:10 +0000 (18:13 +0000)]
Merge commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4'

* commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4':
  msmpeg4data: K&R formatting cosmetics

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac'
Derek Buitenhuis [Wed, 24 Feb 2016 18:12:26 +0000 (18:12 +0000)]
Merge commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac'

* commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac':
  build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba'
Derek Buitenhuis [Wed, 24 Feb 2016 18:11:03 +0000 (18:11 +0000)]
Merge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba'

* commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba':
  build: More precise dependencies for h264dsp

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35'
Derek Buitenhuis [Wed, 24 Feb 2016 18:08:45 +0000 (18:08 +0000)]
Merge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35'

This commit is a no-op. We already set this.

* commit 'f273f7fb25b68792be481c9241b0ec2876e41f35':
  mkv: Force the full parsing of mp3

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'
Derek Buitenhuis [Wed, 24 Feb 2016 18:06:40 +0000 (18:06 +0000)]
Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'

* commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0':
  mov: Force the full parsing of mp3

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c'
Derek Buitenhuis [Wed, 24 Feb 2016 18:04:51 +0000 (18:04 +0000)]
Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c'

This commit is a no-op.

We have already reverted the configure changes, and we do not have a typo
in configure.

* commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c':
  Revert all recent configure changes related to dependency resolution
  build: Fix typo in HEVC VDPAU hwaccel dependencies

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'
Derek Buitenhuis [Wed, 24 Feb 2016 18:04:34 +0000 (18:04 +0000)]
Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'

* commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364':
  voc: Split ff_voc_get_packet into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310'
Derek Buitenhuis [Wed, 24 Feb 2016 17:53:30 +0000 (17:53 +0000)]
Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310'

* commit '624e235502c5aa2d17e22dd6c0ccdf080a177310':
  build: Introduce iso_media component

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '82454c3a826bc8aa42474097784b70befd5be532'
Derek Buitenhuis [Wed, 24 Feb 2016 17:46:10 +0000 (17:46 +0000)]
Merge commit '82454c3a826bc8aa42474097784b70befd5be532'

* commit '82454c3a826bc8aa42474097784b70befd5be532':
  build: Let the WTV demuxer select the MPEG-TS demuxer
  build: Adjust mpeg4video parser dependencies
  build: Fix mpegvideo component dependencies
  build: Fix dependencies for components relying on H.263 data tables

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'e453129321778886813dcecf73c8b42f8352ca0e'
Derek Buitenhuis [Wed, 24 Feb 2016 17:38:55 +0000 (17:38 +0000)]
Merge commit 'e453129321778886813dcecf73c8b42f8352ca0e'

* commit 'e453129321778886813dcecf73c8b42f8352ca0e':
  build: Add missing dependencies for eatqi decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '71eaefa64a54bece571299ca600d06f48ac7c6c3'
Derek Buitenhuis [Wed, 24 Feb 2016 17:38:33 +0000 (17:38 +0000)]
Merge commit '71eaefa64a54bece571299ca600d06f48ac7c6c3'

* commit '71eaefa64a54bece571299ca600d06f48ac7c6c3':
  build: Add missing celp_math dependency for G723_1 encoder and decoder

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f'
Derek Buitenhuis [Wed, 24 Feb 2016 17:36:48 +0000 (17:36 +0000)]
Merge commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f'

* commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f':
  checkasm: Use standard multiple inclusion guards

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '3d8025d602045cbd2894e5182d9243c2e864c8c8'
Derek Buitenhuis [Wed, 24 Feb 2016 17:36:11 +0000 (17:36 +0000)]
Merge commit '3d8025d602045cbd2894e5182d9243c2e864c8c8'

* commit '3d8025d602045cbd2894e5182d9243c2e864c8c8':
  profiles: Add missing #endif comment

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab'
Derek Buitenhuis [Wed, 24 Feb 2016 17:35:40 +0000 (17:35 +0000)]
Merge commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab'

* commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab':
  cosmetics: Drop particularly redundant silly comments

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '29c2d06d67724e994980045afa055c6c34611b30'
Derek Buitenhuis [Wed, 24 Feb 2016 17:31:44 +0000 (17:31 +0000)]
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'

* commit '29c2d06d67724e994980045afa055c6c34611b30':
  cosmetics: Drop empty comment lines

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'
Derek Buitenhuis [Wed, 24 Feb 2016 17:24:04 +0000 (17:24 +0000)]
Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'

* commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c':
  hwcontext_cuda/vdpau: add to skipheaders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '9c0bc1e980a99106d6749ec632f166b87275871e'
Derek Buitenhuis [Wed, 24 Feb 2016 17:22:43 +0000 (17:22 +0000)]
Merge commit '9c0bc1e980a99106d6749ec632f166b87275871e'

* commit '9c0bc1e980a99106d6749ec632f166b87275871e':
  qsv: add a missing #include

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit 'b92962436bdcfae478c8598dca397a397762eef8'
Derek Buitenhuis [Wed, 24 Feb 2016 17:20:29 +0000 (17:20 +0000)]
Merge commit 'b92962436bdcfae478c8598dca397a397762eef8'

* commit 'b92962436bdcfae478c8598dca397a397762eef8':
  mov: Fix the format specifier type for size

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '2edc718723b60530aead26c20cbc891102f7d529'
Derek Buitenhuis [Wed, 24 Feb 2016 17:18:49 +0000 (17:18 +0000)]
Merge commit '2edc718723b60530aead26c20cbc891102f7d529'

This is a no-op. This was a part of the already-reverted
broken configure saga.

* commit '2edc718723b60530aead26c20cbc891102f7d529':
  configure: Relax the implication of --enable for components

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
4 years agoMerge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'
Derek Buitenhuis [Wed, 24 Feb 2016 17:18:18 +0000 (17:18 +0000)]
Merge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'

* commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c':
  fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>