]> git.sesse.net Git - ffmpeg/log
ffmpeg
7 years agoavisynth: support pix_fmts added to AviSynth+
Stephen Hutchinson [Tue, 16 Aug 2016 22:45:21 +0000 (18:45 -0400)]
avisynth: support pix_fmts added to AviSynth+

A number of new pix_fmts have been added to AviSynth+:
16-bit packed RGB and RGBA
10-, 12-, 14, and 16-bit YUV 4:2:0, 4:2:2, and 4:4:4
8-, 10-, 12-, 14-, and 16-bit Planar RGB
8-, 10-, 12-, 14-, and 16-bit Planar YUVA and Planar RGBA*
10-, 12-, 14-, and 16-bit GRAY variants*
32-bit floating point Planar YUV(A), Planar RGB(A), and GRAY*

*some of which are not currently available pix_fmts here and were
 not added to the demuxer due to this

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavutil/version: Improve lib versioning scheme for release branches with the next...
Michael Niedermayer [Sat, 6 Aug 2016 10:49:56 +0000 (12:49 +0200)]
avutil/version: Improve lib versioning scheme for release branches with the next major release

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavutil/version: Mention similarities and differences to semver
Michael Niedermayer [Sat, 6 Aug 2016 10:44:18 +0000 (12:44 +0200)]
avutil/version: Mention similarities and differences to semver

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter/vf_minterpolate: do not right shift negative numbers
Davinder Singh [Mon, 29 Aug 2016 15:04:54 +0000 (17:04 +0200)]
avfilter/vf_minterpolate: do not right shift negative numbers

It was source of crashes. Use division instead.

Original patch by author. Log message by comitter.

7 years agoavfilter: make use of ff_filter_get_nb_threads
Paul B Mahol [Sat, 27 Aug 2016 20:44:42 +0000 (22:44 +0200)]
avfilter: make use of ff_filter_get_nb_threads

7 years agoavfilter: add ff_filter_get_nb_threads()
Paul B Mahol [Sat, 27 Aug 2016 20:22:58 +0000 (22:22 +0200)]
avfilter: add ff_filter_get_nb_threads()

7 years agoavfilter: add nb_threads to AVFilterContext
Paul B Mahol [Sat, 27 Aug 2016 20:10:10 +0000 (22:10 +0200)]
avfilter: add nb_threads to AVFilterContext

To be used in following commits.

7 years agodoc/muxers: add option hls_init_time document
Steven Liu [Fri, 26 Aug 2016 23:35:54 +0000 (07:35 +0800)]
doc/muxers: add option hls_init_time document

Reviewed-by: Ibrahim Tachijian <barhom@netsat.se>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/hlsenc: add option hls_init_time to set init hls window segment duration
Steven Liu [Sat, 27 Aug 2016 11:11:14 +0000 (19:11 +0800)]
avformat/hlsenc: add option hls_init_time to set init hls window segment duration

recover segments duration time by hls_time after init hls window.
This is reuqested by Ibrahim Tachijian

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/mov: aax: pass proper AVClass to av_log()
Thomas Hebb [Sun, 28 Aug 2016 16:24:55 +0000 (12:24 -0400)]
avformat/mov: aax: pass proper AVClass to av_log()

av_log() expects its first parameter to be a pointer to a struct whose
first element is a pointer to an AVClass. In what I can only imagine is
a typo, one call to av_log() in the AAX decryption code instead passes
a pointer to an AVSHA struct, which doesn't even contain a pointer as
its first element, much less a pointer to an AVClass. Change the call to
pass the current MOVContext, as surrounding calls do.

The incorrect AVClass was causing mpv to emit the warning "av_log
callback called with bad parameters" when playing an .aax file.

Signed-off-by: Thomas Hebb <tommyhebb@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/nvenc: update license header
Timo Rothenpieler [Sun, 28 Aug 2016 17:51:22 +0000 (19:51 +0200)]
avcodec/nvenc: update license header

7 years agoavcodec/nvenc: use proper soname for cuda/nvenc libraries
Timo Rothenpieler [Sun, 28 Aug 2016 17:49:56 +0000 (19:49 +0200)]
avcodec/nvenc: use proper soname for cuda/nvenc libraries

7 years agoavcodec/nvenc: check maximum driver API version
Timo Rothenpieler [Sun, 28 Aug 2016 17:46:44 +0000 (19:46 +0200)]
avcodec/nvenc: check maximum driver API version

7 years agoavcodec/nvenc: fix potantially uninitialized free
Timo Rothenpieler [Sun, 28 Aug 2016 16:19:21 +0000 (18:19 +0200)]
avcodec/nvenc: fix potantially uninitialized free

7 years agoavcodec/nvenc: fix library names on cygwin
Timo Rothenpieler [Sun, 28 Aug 2016 15:54:29 +0000 (17:54 +0200)]
avcodec/nvenc: fix library names on cygwin

7 years agoffmpeg: fix -stream_loop with -re
Marton Balint [Thu, 30 Jun 2016 23:12:25 +0000 (01:12 +0200)]
ffmpeg: fix -stream_loop with -re

Otherwise the stream failed with EAGAIN.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoavcodec/nvenc: added support for rate control lookahead
Oliver Collyer [Thu, 25 Aug 2016 15:20:03 +0000 (16:20 +0100)]
avcodec/nvenc: added support for rate control lookahead

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
7 years agoavcodec/nvenc: added support for 10 bit HEVC encoding
Oliver Collyer [Thu, 25 Aug 2016 15:18:03 +0000 (16:18 +0100)]
avcodec/nvenc: added support for 10 bit HEVC encoding

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
7 years agoavcodec/nvenc: include nvEncodeAPI v7 SDK header
Timo Rothenpieler [Sat, 27 Aug 2016 12:39:35 +0000 (14:39 +0200)]
avcodec/nvenc: include nvEncodeAPI v7 SDK header

As Nvidia has put the most recent Video Codec SDK behind a double
registration wall, of which one needs manual approval of a lenghty
application, bundling this header saves everyone trying to use NVENC
from that headache.

The header is still MIT licensed and thus fine to bundle with ffmpeg.

Not bundling this header would get ffmpeg stuck at SDK v6, which is
still freely available, holding back future development of the NVENC
encoder.

7 years agoavformat: fix decoded creation_time timestamps
Marton Balint [Wed, 29 Jun 2016 22:55:48 +0000 (00:55 +0200)]
avformat: fix decoded creation_time timestamps

Use proper ISO 8601 timestamps which also signal that they are in UTC.

This changes the format of creation_time and modification_date metadata values
from 2016-06-01 22:30:00 to 2016-01-01T22:30:00.000000Z

Fixes ticket #5673.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoMAINTAINER: add myself for Motion Estimation and Interpolation filters
Davinder Singh [Fri, 26 Aug 2016 21:30:32 +0000 (03:00 +0530)]
MAINTAINER: add myself for Motion Estimation and Interpolation filters

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolavc/lpc: Add min_shift parameter in LPC
Jai Luthra [Mon, 22 Aug 2016 21:02:04 +0000 (02:32 +0530)]
lavc/lpc: Add min_shift parameter in LPC

The min_shift parameter is needed by the MLP encoder

Signed-off-by: Jai Luthra <me@jailuthra.in>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter: hflip,swapuv,vflip: add timeline support
Paul B Mahol [Sun, 28 Aug 2016 09:00:06 +0000 (11:00 +0200)]
avfilter: hflip,swapuv,vflip: add timeline support

7 years agoavformat/utils: fix a codecpar non use
James Almer [Fri, 26 Aug 2016 18:28:21 +0000 (15:28 -0300)]
avformat/utils: fix a codecpar non use

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavfilter/vf_convolution: add >8 bit depth support
Paul B Mahol [Sat, 27 Aug 2016 14:04:07 +0000 (16:04 +0200)]
avfilter/vf_convolution: add >8 bit depth support

7 years agoavfilter/vf_atadenoise: add planes option
Paul B Mahol [Sat, 27 Aug 2016 11:44:21 +0000 (13:44 +0200)]
avfilter/vf_atadenoise: add planes option

Make possible filtering only some planes.

7 years agovf_colorspace: Add support for full range yuv
Vittorio Giovara [Thu, 25 Aug 2016 23:14:58 +0000 (19:14 -0400)]
vf_colorspace: Add support for full range yuv

Whenever a full range video is input, since the YUVJ* formats are not
listed as supported for this filter, a range reduction takes place
through the auto-inserted format filter, forcing the conversion to
operate on a limited range,

However the filter handles full range videos perfectly fine, so adding
support to YUVJ* formats will allow skipping a conversion step, while
providing completely identical results.

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 agovf_colorspace: Check av_frame_copy_props() return value
Vittorio Giovara [Thu, 25 Aug 2016 23:14:57 +0000 (19:14 -0400)]
vf_colorspace: Check av_frame_copy_props() return value

This function can potentially allocate memory.

Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/utils: End probing if the expected codec surpasses AVPROBE_SCORE_STREAM_RETRY
Michael Niedermayer [Fri, 26 Aug 2016 23:12:49 +0000 (01:12 +0200)]
avformat/utils: End probing if the expected codec surpasses AVPROBE_SCORE_STREAM_RETRY

Fixes Ticket5800

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter: add vaguedenoiser filter
Paul B Mahol [Wed, 24 Aug 2016 20:13:03 +0000 (22:13 +0200)]
avfilter: add vaguedenoiser filter

7 years agoavfilter/motion_estimation: Fix pre processor formating
Michael Niedermayer [Fri, 26 Aug 2016 18:19:29 +0000 (20:19 +0200)]
avfilter/motion_estimation: Fix pre processor formating

IIRC, The spaces are not standard before the #

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/filters: fix anequalizer docs
Paul B Mahol [Fri, 26 Aug 2016 18:59:00 +0000 (20:59 +0200)]
doc/filters: fix anequalizer docs

7 years agotools/crypto_bench: add support for des
James Almer [Fri, 26 Aug 2016 18:43:44 +0000 (15:43 -0300)]
tools/crypto_bench: add support for des

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
7 years agotools/crypto_bench: simplify gcrypt functions using a macro
James Almer [Fri, 26 Aug 2016 18:41:57 +0000 (15:41 -0300)]
tools/crypto_bench: simplify gcrypt functions using a macro

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavfilter/motion_estimation: Fix warning: variable dir_x set but not used
Michael Niedermayer [Fri, 26 Aug 2016 18:17:39 +0000 (20:17 +0200)]
avfilter/motion_estimation: Fix warning: variable dir_x set but not used

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter: added motion estimation and interpolation filters
Davinder Singh [Tue, 23 Aug 2016 12:20:35 +0000 (17:50 +0530)]
avfilter: added motion estimation and interpolation filters

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolibavcodec/bsfs: Fix bsf option setting
Jan Sebechlebsky [Thu, 25 Aug 2016 22:47:12 +0000 (00:47 +0200)]
libavcodec/bsfs: Fix bsf option setting

AV_OPT_SEARCH_CHILDREN flag must be passed to av_opt_set_dict()
to set options for private context.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoaf_hdcd: av_frame_free(out) if av_frame_copy_props() fails
Burt P [Thu, 25 Aug 2016 22:05:39 +0000 (17:05 -0500)]
af_hdcd: av_frame_free(out) if av_frame_copy_props() fails

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agoaf_hdcd: for easier maintenance alongside libhdcd
Burt P [Mon, 22 Aug 2016 22:34:35 +0000 (17:34 -0500)]
af_hdcd: for easier maintenance alongside libhdcd

Mostly just re-arranges some code to make it easier to update this
filter and libhdcd together. filter_frame() is much simpler as a
result.

* use the HDCD detection data structure and functions from libhdcd,
  moved detection code out of filter_frame()
* moved analyze_mode preparation out of filter_frame() into
  hdcd_analyze_prepare(), from libhdcd
* moved some macro definitions to the top so they are all together

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agowebm_chunk: Set pts precision to milliseconds
Vignesh Venkatasubramanian [Tue, 23 Aug 2016 00:13:23 +0000 (17:13 -0700)]
webm_chunk: Set pts precision to milliseconds

Milliseconds is the de-factor precision for timestamps in
Matroska/WebM media.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agomov: Remove old b-frame/video delay heuristic
Derek Buitenhuis [Thu, 25 Aug 2016 15:58:15 +0000 (16:58 +0100)]
mov: Remove old b-frame/video delay heuristic

This was added before edts support existed, and is no longer
valid.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agomov: Remove ancient heuristic hack
Derek Buitenhuis [Thu, 25 Aug 2016 15:58:14 +0000 (16:58 +0100)]
mov: Remove ancient heuristic hack

This breaks files with legitimate single-entry edit lists,
and the hack, introduced in f03a081df09f9c4798a17d7e24446ed47924b11b,
has no link to any known sample in its commit message.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
7 years agotests/audiomatch: Fix compile warning
Steven Liu [Thu, 25 Aug 2016 12:40:17 +0000 (05:40 -0700)]
tests/audiomatch: Fix compile warning

Making sure bestpos is initialized to zero to prevent gcc from kvetching.
It's harmless (although it's not obvious that it's harmless)
from code inspection:
tests/audiomatch.c: In function ‘main’:
tests/audiomatch.c:40: warning: ‘bestpos’ may be used uninitialized in this function

Thanks to Moritz Barsnick for first bringing this to the attention.

Signed-off-by: LiuQi <liuqi@gosun.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter/af_acrusher: Rename sun/sov
Michael Niedermayer [Thu, 25 Aug 2016 10:33:08 +0000 (12:33 +0200)]
avfilter/af_acrusher: Rename sun/sov

The names are hard to understand and also seem to break build on at least some solaris
versions

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter: add yuvtestsrc source filter
Paul B Mahol [Wed, 24 Aug 2016 16:55:05 +0000 (18:55 +0200)]
avfilter: add yuvtestsrc source filter

7 years agoavfilter: add lut2 filter
Paul B Mahol [Wed, 24 Aug 2016 08:36:31 +0000 (10:36 +0200)]
avfilter: add lut2 filter

7 years agoavcodec/exr: Check tile positions
Michael Niedermayer [Wed, 17 Aug 2016 19:22:29 +0000 (21:22 +0200)]
avcodec/exr: Check tile positions

This also disabled the case of mixed x/ymin with tiles, the code
handles these cases inconsistent for the 2 coordinate axis and is
unlikely working correctly.

Fixes crash
Fixes: poc1.exr, poc2.exr
Found-by: Yaoguang Chen of Aliapy unLimit Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoaf_hdcd: check return value of av_frame_copy_props()
Burt P [Mon, 22 Aug 2016 22:14:49 +0000 (17:14 -0500)]
af_hdcd: check return value of av_frame_copy_props()

Anton Khirnov:
"[av_frame_copy_props()] potentially contains memory allocation,
so the return value needs to be checked."

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agofate: add test for af_hdcd analyze mode
Burt P [Mon, 22 Aug 2016 22:11:42 +0000 (17:11 -0500)]
fate: add test for af_hdcd analyze mode

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agoavfilter/vf_lut: add planar RGB support
Paul B Mahol [Wed, 24 Aug 2016 06:30:22 +0000 (08:30 +0200)]
avfilter/vf_lut: add planar RGB support

7 years agofate: update for gbrap after 61980dc479ce045d2e280bff0ba2118ccb8ce595
Paul B Mahol [Wed, 24 Aug 2016 06:03:20 +0000 (08:03 +0200)]
fate: update for gbrap after 61980dc479ce045d2e280bff0ba2118ccb8ce595

7 years agolavf/movenc: Add a missing assignment if memory allocation fails.
Carl Eugen Hoyos [Tue, 23 Aug 2016 19:02:57 +0000 (21:02 +0200)]
lavf/movenc: Add a missing assignment if memory allocation fails.

Fixes a warning:
libavformat/movenc.c:5947:17: warning: statement with no effect [-Wunused-value]

7 years agoavformat/avcodec: support rawvideo with planar rgb and alpha in nut
Paul B Mahol [Tue, 23 Aug 2016 14:48:48 +0000 (16:48 +0200)]
avformat/avcodec: support rawvideo with planar rgb and alpha in nut

7 years agolibzvbi depends on ass
Rafaël Carré [Tue, 23 Aug 2016 09:54:26 +0000 (11:54 +0200)]
libzvbi depends on ass

7 years agoavfilter/vf_maskedmerge: add support for more pixel formats
Paul B Mahol [Tue, 23 Aug 2016 07:51:43 +0000 (09:51 +0200)]
avfilter/vf_maskedmerge: add support for more pixel formats

7 years agoavfilter: add hysteresis filter
Paul B Mahol [Mon, 22 Aug 2016 13:45:44 +0000 (15:45 +0200)]
avfilter: add hysteresis filter

7 years agoavfilter: add maskedclamp filter
Paul B Mahol [Mon, 22 Aug 2016 08:02:15 +0000 (10:02 +0200)]
avfilter: add maskedclamp filter

7 years agolavc/h264dec: Improve "Increasing reorder buffer" message loglevel.
Carl Eugen Hoyos [Tue, 23 Aug 2016 07:31:09 +0000 (09:31 +0200)]
lavc/h264dec: Improve "Increasing reorder buffer" message loglevel.

Do not show the message for the first frame by default, show a
warning if increasing is necessary in the middle of the stream.

7 years agoavutil/mem: remove av_realloc / av_malloc incompatibility warning
Michael Niedermayer [Tue, 21 Apr 2015 13:12:36 +0000 (15:12 +0200)]
avutil/mem: remove av_realloc / av_malloc incompatibility warning

memalign() is not guranteed to be compatible with free() or realloc()
and for platforms in this category we have --enable-memalign-hack
(which should be enabled automatically if such system is detected)
Trying to somehow half support systems that can free() memalign memory
but not reallocate it seems not worth the amount of work needed to
keep 2 then incompatible allocation systems and ensure their
seperation. That is unless this would affect a major platform
on which we want to avoid the memalign hack code

The warnings also cause wasted time and effort as people try
to maintain a separation that does not exist currently.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolibavformat/utils: added ability to probe AVMEDIA_TYPE_DATA format
Erkki Seppälä [Tue, 23 Aug 2016 09:03:20 +0000 (12:03 +0300)]
libavformat/utils: added ability to probe AVMEDIA_TYPE_DATA format

Now force_codec_ids supports AVMEDIA_TYPE_DATA and
avformat_query_codec accepts data codecs as well in addition to video,
audio and subtitle tracks.

Signed-off-by: Erkki Seppälä <erkki.seppala.ext@nokia.com>
Signed-off-by: OZOPlayer <OZOPL@nokia.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/aacenc: Tighter input checks
Michael Niedermayer [Tue, 23 Aug 2016 09:00:29 +0000 (11:00 +0200)]
avcodec/aacenc: Tighter input checks

Fixes occurance of NaN/Inf leading to assertion failures and out of array access
Fixes: d1c38a09acc34845c6be3a127a5aacaf/signal_sigsegv_3982225_6121_d18bd5451d4245ee09408f04badd1b83.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoswscale/output: Fix rounding offset in yuv2gbrp_full_X_c()
Michael Niedermayer [Mon, 22 Aug 2016 23:04:30 +0000 (01:04 +0200)]
swscale/output: Fix rounding offset in yuv2gbrp_full_X_c()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoconfigure: force _WIN32_WINNT >= 0x0502 on mingw32 targets
James Almer [Fri, 19 Aug 2016 18:38:28 +0000 (15:38 -0300)]
configure: force _WIN32_WINNT >= 0x0502 on mingw32 targets

Windows versions earlier than XP are not supported.

Should fix compilation of command line tools.

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavformat/fifo: Add fate test
Jan Sebechlebsky [Tue, 9 Aug 2016 11:26:04 +0000 (13:26 +0200)]
avformat/fifo: Add fate test

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoMAINTAINERS: Add myself as maintainer of fifo muxer
Jan Sebechlebsky [Tue, 2 Aug 2016 13:24:13 +0000 (15:24 +0200)]
MAINTAINERS: Add myself as maintainer of fifo muxer

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoavformat: Add fifo pseudo-muxer
Jan Sebechlebsky [Tue, 9 Aug 2016 11:26:03 +0000 (13:26 +0200)]
avformat: Add fifo pseudo-muxer

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agodoc&tools: Add murge script, for analyzing 3 way conflicts.
Michael Niedermayer [Thu, 18 Aug 2016 16:45:23 +0000 (18:45 +0200)]
doc&tools: Add murge script, for analyzing 3 way conflicts.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/alsdec: Remove unused variable
Michael Niedermayer [Mon, 22 Aug 2016 15:36:56 +0000 (17:36 +0200)]
avcodec/alsdec: Remove unused variable

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/me_cmp: add median SAD compare function
Stanislav Dolganov [Thu, 18 Aug 2016 11:40:09 +0000 (14:40 +0300)]
avcodec/me_cmp: add median SAD compare function

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/alsdec: Implement floating point sample data decoding
Umair Khan [Fri, 12 Aug 2016 12:21:41 +0000 (17:51 +0530)]
avcodec/alsdec: Implement floating point sample data decoding

It conforms to the RM22 version of the reference encoder

Signed-off-by: Umair Khan <omerjerk@gmail.com>
7 years agoavcodec: Implement masked lz decompression
Umair Khan [Fri, 12 Aug 2016 12:19:15 +0000 (17:49 +0530)]
avcodec: Implement masked lz decompression

Signed-off-by: Umair Khan <omerjerk@gmail.com>
7 years agoavutil: Softfloat implementation for IEEE 754 floating point
Umair Khan [Fri, 12 Aug 2016 12:17:06 +0000 (17:47 +0530)]
avutil: Softfloat implementation for IEEE 754 floating point

Signed-off-by: Umair Khan <omerjerk@gmail.com>
7 years agotests/fate/vcodec: add dnxhr mov tests
Mark Reid [Mon, 22 Aug 2016 01:32:31 +0000 (11:32 +1000)]
tests/fate/vcodec: add dnxhr mov tests

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/mux: Restore original ts in write_packet on error
Jan Sebechlebsky [Tue, 2 Aug 2016 13:24:19 +0000 (15:24 +0200)]
avformat/mux: Restore original ts in write_packet on error

Restore original timestamps in write_packet() if the
actual write operation was not successfull. This allows
to pass the same packet to nonblocking muxer repeatedly
without corrupting the timestamps.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/filters: re-order hdcd options to match --help filter=hdcd
Burt P [Mon, 22 Aug 2016 09:37:54 +0000 (04:37 -0500)]
doc/filters: re-order hdcd options to match --help filter=hdcd

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agolibavcodec/dnxhdenc: fix typo, check if profile is dnxhr 444 or hqx
Mark Reid [Mon, 22 Aug 2016 00:07:49 +0000 (17:07 -0700)]
libavcodec/dnxhdenc: fix typo, check if profile is dnxhr 444 or hqx

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/swfdec: Fix memleak on error
Michael Niedermayer [Sun, 21 Aug 2016 23:01:44 +0000 (01:01 +0200)]
avformat/swfdec: Fix memleak on error

Fixes: 9eb9cf5b8c26dd0fa7107ed0348dcc1f/signal_sigabrt_7ffff6ae7c37_8925_1f676b5229d009f2b56dfd9e149fa6ba.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agomem: Extend and edit Doxygen
Timothy Gu [Sat, 30 Jul 2016 00:39:02 +0000 (17:39 -0700)]
mem: Extend and edit Doxygen

7 years agoavformat/wtvdec: Check pointer before use
Michael Niedermayer [Sun, 21 Aug 2016 19:30:36 +0000 (21:30 +0200)]
avformat/wtvdec: Check pointer before use

Fixes out of array read
Fixes: 049fdf78565f1ce5665df236d90f8657/asan_heap-oob_10a5a97_1026_42f9d4855547329560f385768de2f3fb.wtv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agolibavcodec/wmalosslessdec: Check the remaining bits
Michael Niedermayer [Sun, 21 Aug 2016 18:30:34 +0000 (20:30 +0200)]
libavcodec/wmalosslessdec: Check the remaining bits

Fixes assertion failure
Fixes: 24ebfda03228b5cc1ef792608cfba458/signal_sigabrt_7ffff6ae7c37_6473_3fa8a111dbc752b1a7c411c5ab79aaa4.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agodoc/filters: update for af_hdcd
Burt P [Sun, 21 Aug 2016 18:44:17 +0000 (13:44 -0500)]
doc/filters: update for af_hdcd

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agoaf_hdcd: PE table limits
Burt P [Sun, 21 Aug 2016 18:38:47 +0000 (13:38 -0500)]
af_hdcd: PE table limits

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agoaf_hdcd: add AVOption to disable autoconversion in the filter graph
Burt P [Wed, 10 Aug 2016 16:35:30 +0000 (11:35 -0500)]
af_hdcd: add AVOption to disable autoconversion in the filter graph

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agoaf_hdcd: add AVOption to set the CDT period
Burt P [Wed, 10 Aug 2016 06:18:18 +0000 (01:18 -0500)]
af_hdcd: add AVOption to set the CDT period

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agoaf_hdcd: Code comments update
Burt P [Sun, 21 Aug 2016 18:00:22 +0000 (13:00 -0500)]
af_hdcd: Code comments update

Signed-off-by: Burt P <pburt0@gmail.com>
7 years agoavfilter/avf_showvolume: calculate color table only once
Paul B Mahol [Sun, 21 Aug 2016 14:46:21 +0000 (16:46 +0200)]
avfilter/avf_showvolume: calculate color table only once

7 years agolavf/hlsenc: add append_list flag into hlsenc
Steven Liu [Sun, 21 Aug 2016 04:55:45 +0000 (12:55 +0800)]
lavf/hlsenc: add append_list flag into hlsenc

When ffmpeg exit by exception, start a new ffmpeg will
cover the old segment list, add this flag can continue
append the new segments into old hls segment list

Signed-off-by: LiuQi <liuqi@gosun.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/bsf: Add custom item name function for bsf list
Jan Sebechlebsky [Sun, 21 Aug 2016 08:36:12 +0000 (10:36 +0200)]
avcodec/bsf: Add custom item name function for bsf list

which will
construct string description of filter chain. This is
done using lazy-initialization, so there is no overhead
if item name is never accessed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter/vf_crop: make possible to do exact cropping for subsampled videos
Paul B Mahol [Sat, 20 Aug 2016 22:01:57 +0000 (00:01 +0200)]
avfilter/vf_crop: make possible to do exact cropping for subsampled videos

7 years agolibavformat/mov: Accept known codepoints in 'colr'
Steven Robertson [Wed, 17 Aug 2016 07:25:47 +0000 (00:25 -0700)]
libavformat/mov: Accept known codepoints in 'colr'

This change relaxes the whitelist on reading color metadata in MOV/BMFF
containers. The whitelist on writing values is still in place.

As a consequence it also fixes an apparent bug in reading 'nclc' values.
The 'nclc' spec [1] is in harmony with ISO 23001-8 for the values it
lists, but the code getting removed was remapping 5->6 and 6->7 for
primaries, which is incorrect, and was remapping 6->5 for color matrix
("colorspace" in the code), which is equivalent but an unnecessary
inconsistency. This logic error doesn't appear in movenc.

Removing the whitelist allows proper conversion when the source codec
relies on the container for proper signaling of newer codepoints, such
as DNxHR and VP9. If converting to a codec or container that has updated
its spec to include the new codepoints, the metadata will be preserved.
If going back to MOV/BMFF, the output whitelist will still kick in, so
this won't result in out-of-spec files being created.

[1] https://developer.apple.com/library/mac/technotes/tn2162/_index.html

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agofate: add DNxHR 12-bit example.
Steven Robertson [Wed, 17 Aug 2016 05:22:54 +0000 (22:22 -0700)]
fate: add DNxHR 12-bit example.

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/adpcm: Fix adpcm_ima_wav padding
Michael Niedermayer [Sat, 20 Aug 2016 23:42:20 +0000 (01:42 +0200)]
avcodec/adpcm: Fix adpcm_ima_wav padding

Fixes out of array read
Fixes: f29f134ea5f5590df554a7733294a587/asan_stack-oob_309d14e_9188_ea01743d6355aff20530f3d4cdaa841a.wav
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/svq3: fix slice size check
Michael Niedermayer [Sat, 20 Aug 2016 20:09:54 +0000 (22:09 +0200)]
avcodec/svq3: fix slice size check

Fixes out of array read
Fixes: 09f46aa2175cade93e3e3932646a56a9/asan_heap-oob_4a5385_2995_498f6abfdc0248288cefe5f4b7ad316c.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavformat/mov: Check STSD atom more completely
Michael Niedermayer [Sat, 20 Aug 2016 18:15:29 +0000 (20:15 +0200)]
avformat/mov: Check STSD atom more completely

Fixes out of array read
Fixes: 13262c363a28da8d6bdcc472aed6e9dc/asan_heap-oob_cfb5e2_3733_31cf3fcc783295c34222eb070a784f84.3gp
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/diracdec: Check numx/y
Michael Niedermayer [Sat, 20 Aug 2016 17:21:07 +0000 (19:21 +0200)]
avcodec/diracdec: Check numx/y

Fixes division by 0
Fixes: 60261c4469ba3e11059890fb2832a515/asan_generic_135e694_2790_beb94eaa0aeb7d11c0437375a8964a99.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavfilter/window_func: use a constant instead of acosh()
James Almer [Sat, 20 Aug 2016 04:03:00 +0000 (01:03 -0300)]
avfilter/window_func: use a constant instead of acosh()

Should fix compilation with non C99 compilers like msvc 2012, where
acosh() is not available.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavdevice/dshow: satisfy alloc contract better
Roger Pack [Tue, 16 Aug 2016 13:42:29 +0000 (07:42 -0600)]
avdevice/dshow: satisfy alloc contract better

prevent non-rgb24 crashes on windows 10 anniversary ed

Signed-off-by: Roger Pack <rogerpack2005@gmail.com>
7 years agox86/avf_showcqt: use the FMULADD_PS x86util macro
James Almer [Sat, 20 Aug 2016 05:12:33 +0000 (02:12 -0300)]
x86/avf_showcqt: use the FMULADD_PS x86util macro

Signed-off-by: James Almer <jamrial@gmail.com>
7 years agoavcodec/h2645_parse: fix nal size
Michael Niedermayer [Fri, 19 Aug 2016 21:54:28 +0000 (23:54 +0200)]
avcodec/h2645_parse: fix nal size

Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
7 years agoavcodec/h2645_parse: Use get_nalsize() in ff_h2645_packet_split()
Michael Niedermayer [Fri, 19 Aug 2016 22:39:07 +0000 (00:39 +0200)]
avcodec/h2645_parse: Use get_nalsize() in ff_h2645_packet_split()

This fixes several regressions in h.264

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>