ffmpeg.git
3 years agoaacenc: fix various typos and an error message
Rostislav Pehlivanov [Sat, 13 Aug 2016 16:34:58 +0000 (17:34 +0100)]
aacenc: fix various typos and an error message

Too much copy and pasting.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoaacenc: unmark the fast coder as experimental
Rostislav Pehlivanov [Sat, 6 Aug 2016 23:49:34 +0000 (00:49 +0100)]
aacenc: unmark the fast coder as experimental

This version has had much testing so there's little point in keeping it
maked as experimental.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoaacenc: add a faster version of twoloop as the "fast" coder
Rostislav Pehlivanov [Sat, 6 Aug 2016 23:47:31 +0000 (00:47 +0100)]
aacenc: add a faster version of twoloop as the "fast" coder

Does nothing fancy but still sounds very decent at 128kbps.
Still room to improve by bringing in the low pass and PNS management
from the main big twoloop which should improve its quality but not
sacrifice that much speed.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
3 years agoavfilter/vf_signalstats: measure video bitdepth
Paul B Mahol [Thu, 11 Aug 2016 16:10:46 +0000 (18:10 +0200)]
avfilter/vf_signalstats: measure video bitdepth

3 years agoavfilter/vf_signalstats: add >8 bit depth support
Paul B Mahol [Thu, 28 Jul 2016 12:20:01 +0000 (14:20 +0200)]
avfilter/vf_signalstats: add >8 bit depth support

3 years agoavcodec/bsf: Add ff_bsf_get_packet_ref() function
Jan Sebechlebsky [Thu, 28 Jul 2016 16:18:13 +0000 (18:18 +0200)]
avcodec/bsf: Add ff_bsf_get_packet_ref() function

Use of this function can save unnecessary malloc operation
in bitstream filter.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoconfigure: Check for arc4random() header definition.
Carl Eugen Hoyos [Sat, 13 Aug 2016 00:22:16 +0000 (02:22 +0200)]
configure: Check for arc4random() header definition.

Fixes Cygwin compilation.

3 years agodoc/bsfs: Fix bsf options divider in documentation
Jan Sebechlebsky [Thu, 28 Jul 2016 16:18:12 +0000 (18:18 +0200)]
doc/bsfs: Fix bsf options divider in documentation

The actual implementation uses ':' divider, not '/' as
documented.

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/bsf: Forbid packet without payload in av_bsf_send_packet
Jan Sebechlebsky [Tue, 26 Jul 2016 10:40:08 +0000 (12:40 +0200)]
avcodec/bsf: Forbid packet without payload in av_bsf_send_packet

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/bsf: Set EOF flag only in pkt == NULL
Jan Sebechlebsky [Tue, 26 Jul 2016 10:40:07 +0000 (12:40 +0200)]
avcodec/bsf: Set EOF flag only in pkt == NULL

Set BSF EOF flag only if pkt == NULL in av_bsf_send_packet().

Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/raw: Support QT b64a ARGB64 rawvideo.
Carl Eugen Hoyos [Fri, 12 Aug 2016 23:44:52 +0000 (01:44 +0200)]
lavc/raw: Support QT b64a ARGB64 rawvideo.

Decoder based on a patch by v0lt, v0lt rambler ru
Fixes ticket #5657.

3 years agolavc/screenpresso: Fix 32bit pix_fmt, there is no transparency.
Carl Eugen Hoyos [Fri, 12 Aug 2016 23:35:10 +0000 (01:35 +0200)]
lavc/screenpresso: Fix 32bit pix_fmt, there is no transparency.

Fixes a remaining issue of ticket #5025.

3 years agofate: add test for compand filter
Petru Rares Sincraian [Fri, 12 Aug 2016 17:00:09 +0000 (19:00 +0200)]
fate: add test for compand filter

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agotests/fate/vcodec: add dnxhr edge tests
Mark Reid [Sun, 7 Aug 2016 23:15:28 +0000 (16:15 -0700)]
tests/fate/vcodec: add dnxhr edge tests

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavcodec/dnxhdenc: add edge emulate for dnxhr
Mark Reid [Sun, 7 Aug 2016 23:15:27 +0000 (16:15 -0700)]
libavcodec/dnxhdenc: add edge emulate for dnxhr

Fixes handling for resolutions that are not multiples of 16.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/utils: only warn when passed invalid lowres value
Aman Gupta [Thu, 4 Aug 2016 22:35:57 +0000 (15:35 -0700)]
avcodec/utils: only warn when passed invalid lowres value

This makes it easier to use the lowres option when dealing with input
files in different codecs. If the codec doesn't support lowres=1 for
instance, it will throw a warning and use lowres=0 instead of erroring
out completely.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavformat/http: add support for headers option in listen mode
Moritz Barsnick [Thu, 11 Aug 2016 09:29:07 +0000 (11:29 +0200)]
libavformat/http: add support for headers option in listen mode

Instead of silently ignoring the headers option in listen mode, use
the provided headers.

Signed-off-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/filters: move hdcd documentation from video section to audio section
Paul B Mahol [Thu, 11 Aug 2016 20:21:29 +0000 (22:21 +0200)]
doc/filters: move hdcd documentation from video section to audio section

3 years agoavfilter/af_adelay: make it possible to delay channels by exact number of samples
Paul B Mahol [Thu, 11 Aug 2016 19:42:56 +0000 (21:42 +0200)]
avfilter/af_adelay: make it possible to delay channels by exact number of samples

3 years agoavisynth: simplify the pix_fmt check for the newer AviSynth API
Stephen Hutchinson [Thu, 11 Aug 2016 03:14:35 +0000 (23:14 -0400)]
avisynth: simplify the pix_fmt check for the newer AviSynth API

The values don't need to be hardcoded since the correct values are
returned by avs_bits_per_pixel.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocheckasm: h264dsp: Initialize the padding area
Martin Storsjö [Mon, 27 Jun 2016 19:22:21 +0000 (22:22 +0300)]
checkasm: h264dsp: Initialize the padding area

This fixes valgrind warnings about conditional jumps based on
uninitialized data (even though the uninitialized data only ever
was compared with a direct copy of the same uninitialized data).

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/avf_avectorscope: fix initialization for prev_y in polar mode
Paul B Mahol [Thu, 11 Aug 2016 15:30:32 +0000 (17:30 +0200)]
avfilter/avf_avectorscope: fix initialization for prev_y in polar mode

3 years agoavfilter/avf_avectorscope: add scale option
Paul B Mahol [Thu, 11 Aug 2016 15:21:54 +0000 (17:21 +0200)]
avfilter/avf_avectorscope: add scale option

3 years agodoc/filters: fix typo in acrusher filter docs
Paul B Mahol [Thu, 11 Aug 2016 13:26:14 +0000 (15:26 +0200)]
doc/filters: fix typo in acrusher filter docs

3 years agoavfilter: add acrusher filter
Paul B Mahol [Wed, 10 Aug 2016 14:11:37 +0000 (16:11 +0200)]
avfilter: add acrusher filter

3 years agoavformat/id3v2: fix memleak with empty strings
Michael Niedermayer [Thu, 11 Aug 2016 12:10:19 +0000 (14:10 +0200)]
avformat/id3v2: fix memleak with empty strings

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolibavformat/mxfenc: add UID for unconstrained H.264 coded video in baseline profile
Matthias Hunstock [Tue, 9 Aug 2016 12:15:38 +0000 (14:15 +0200)]
libavformat/mxfenc: add UID for unconstrained H.264 coded video in baseline profile

Enable the MXF muxer to mux baseline H.264 video streams.

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfiltergraph.c: restore disabling of auto conversions
Burt P [Wed, 10 Aug 2016 09:04:29 +0000 (04:04 -0500)]
avfiltergraph.c: restore disabling of auto conversions

Restore a check added in 440af105f2306d3c7b3b3f4d7530bab910d49cb9
but lost sometime after. avfilter_graph_set_auto_convert() will
have an effect once again.

Signed-off-by: Burt P <pburt0@gmail.com>
3 years agoavfilter/avf_showwaves: add sqrt and cbrt amplitude scalers
Paul B Mahol [Wed, 10 Aug 2016 09:34:04 +0000 (11:34 +0200)]
avfilter/avf_showwaves: add sqrt and cbrt amplitude scalers

3 years agoavfilter/vf_remap: >8 bit support
Paul B Mahol [Wed, 10 Aug 2016 08:02:05 +0000 (10:02 +0200)]
avfilter/vf_remap: >8 bit support

3 years agoavfilter/drawutils: Fix single plane with alpha
Michael Niedermayer [Tue, 9 Aug 2016 10:22:15 +0000 (12:22 +0200)]
avfilter/drawutils: Fix single plane with alpha

Fixes Ticket5720

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/filters: add one more lutyuv example
Paul B Mahol [Tue, 9 Aug 2016 10:35:01 +0000 (12:35 +0200)]
doc/filters: add one more lutyuv example

3 years agodocs/filters: Fix parameter names for colorspace filter
Derek Buitenhuis [Mon, 8 Aug 2016 14:26:30 +0000 (15:26 +0100)]
docs/filters: Fix parameter names for colorspace filter

They were erroneously set to the name of the unit instead of
the parameter name.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
3 years agoavformat/id3v2: Mark variable as unused to avoid "set but not used" warning
Michael Niedermayer [Mon, 8 Aug 2016 12:36:04 +0000 (14:36 +0200)]
avformat/id3v2: Mark variable as unused to avoid "set but not used" warning

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/rawdec: Fix palette handling with changing palettes
Michael Niedermayer [Thu, 4 Aug 2016 10:26:41 +0000 (12:26 +0200)]
avcodec/rawdec: Fix palette handling with changing palettes

Fixes out of array access

Fixes: poc.swf
Found-by: 连一汉 <lianyihan@360.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agocmdutils: remove the current working directory from the DLL search path on win32
Hendrik Leppkes [Mon, 8 Aug 2016 13:27:41 +0000 (15:27 +0200)]
cmdutils: remove the current working directory from the DLL search path on win32

Reviewed-by: Matt Oliver <protogonoi@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoaf_hdcd: Don't warn if converting from AV_SAMPLE_FMT_S16P
Burt P [Mon, 8 Aug 2016 16:14:08 +0000 (11:14 -0500)]
af_hdcd: Don't warn if converting from AV_SAMPLE_FMT_S16P

Also checking AVFilterLink->type is AVMEDIA_TYPE_AUDIO before
calling av_get_sample_fmt_name() on AVFilterLink->format.

Signed-off-by: Burt P <pburt0@gmail.com>
3 years agoaf_hdcd: Add analyze mode
Burt P [Sun, 7 Aug 2016 07:48:21 +0000 (02:48 -0500)]
af_hdcd: Add analyze mode

A new mode, selected by filter option, to aid in analysis of HDCD
encoded audio. In this mode the audio is replaced by a solid tone and
the amplitude is adjusted to signal some specified aspect of the process.
The output file can be loaded in an audio editor alongside the original,
where the user can see where different features or states are present.

Signed-off-by: Burt P <pburt0@gmail.com>
3 years agoavcodec/ffv1: add AV_PIX_FMT_GBRP16 support
Michael Niedermayer [Sun, 7 Aug 2016 22:00:46 +0000 (00:00 +0200)]
avcodec/ffv1: add AV_PIX_FMT_GBRP16 support

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ffv1: template functions to allow data types different from int16_t
Michael Niedermayer [Sun, 7 Aug 2016 21:37:17 +0000 (23:37 +0200)]
avcodec/ffv1: template functions to allow data types different from int16_t

This is required for >= 16bit RGB support
I tried it without templates but its too much duplicated code

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/af_dynaudnorm: use better check for infinite loop
Paul B Mahol [Sun, 7 Aug 2016 21:47:04 +0000 (23:47 +0200)]
avfilter/af_dynaudnorm: use better check for infinite loop

Apparently due to rounding this happens.

3 years agoavfilter/avf_showspectrum: improve dB scale description
Paul B Mahol [Sun, 7 Aug 2016 18:19:34 +0000 (20:19 +0200)]
avfilter/avf_showspectrum: improve dB scale description

3 years agoavcodec/qsvdec: Fix null dereferences in the qsv decoder
Yuli Khodorkovskiy [Fri, 29 Jul 2016 15:00:44 +0000 (11:00 -0400)]
avcodec/qsvdec: Fix null dereferences in the qsv decoder

This patch fixes the h264_qsv decoder issues mentioned
in https://ffmpeg.zeranoe.com/forum/viewtopic.php?t=2962.

The patch may be tested by specifying h264_qsv as the decoder to ffplay
for an h264 encoded file.

ffplay -vcodec h264_qsv foo.mts

Signed-off-by: Yuli Khodorkovskiy <ykhodo@gmail.com>
Push requested-by: Ivan Uskov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/raw: Fix decoding of ilacetest.mov
Michael Niedermayer [Sun, 7 Aug 2016 14:27:31 +0000 (16:27 +0200)]
avcodec/raw: Fix decoding of ilacetest.mov

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/filters: reorganize some entries, move scale_npp to right section
Paul B Mahol [Sun, 7 Aug 2016 13:51:47 +0000 (15:51 +0200)]
doc/filters: reorganize some entries, move scale_npp to right section

Also remove select entry in audio section, probably error in merge.

3 years agodoc/filters: fix typo in extrastereo docs
Paul B Mahol [Sun, 7 Aug 2016 09:22:42 +0000 (11:22 +0200)]
doc/filters: fix typo in extrastereo docs

3 years agoavfilter: add crystalizer audio filter
Vitaly Ostrosablin [Sat, 6 Aug 2016 07:50:35 +0000 (10:50 +0300)]
avfilter: add crystalizer audio filter

Signed-off-by: Vitaly Ostrosablin <tmp6154@yandex.ru>
3 years agoavformat: read id3v2 comment tags
Chris Moeller [Fri, 5 Aug 2016 22:54:24 +0000 (15:54 -0700)]
avformat: read id3v2 comment tags

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/ttadsp: cosmetics
James Almer [Sat, 6 Aug 2016 21:27:01 +0000 (18:27 -0300)]
avcodec/ttadsp: cosmetics

Clean some header includes and use the same naming scheme as
in ttaencdsp

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/mov: Enable mp3 parsing if a packet needs it
Michael Niedermayer [Sat, 16 Jul 2016 21:27:54 +0000 (23:27 +0200)]
avformat/mov: Enable mp3 parsing if a packet needs it

Fixes Ticket5689

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoMerge commit '90944ee3ab79081845ea1bd97eea475031ce0842'
James Almer [Sat, 6 Aug 2016 16:31:12 +0000 (13:31 -0300)]
Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'

* commit '90944ee3ab79081845ea1bd97eea475031ce0842':
  avconv: refactor selecting an encoder

Conflicts:
ffmpeg.c
ffmpeg_opt.c

Merged-by: James Almer <jamrial@gmail.com>
3 years agoaf_hdcd: convert AVOptions from INT to BOOL
Burt P [Fri, 5 Aug 2016 21:08:46 +0000 (16:08 -0500)]
af_hdcd: convert AVOptions from INT to BOOL

As suggested by Timothy Gu.

Signed-off-by: Burt P <pburt0@gmail.com>
3 years agoavcodec/ffv1enc: Fix assertion failure with non zero bits per sample
Michael Niedermayer [Fri, 5 Aug 2016 23:53:30 +0000 (01:53 +0200)]
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample

Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.
Carl Eugen Hoyos [Tue, 2 Aug 2016 17:02:09 +0000 (19:02 +0200)]
lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.

Fixes Debian bugs #831529, #831909, #832964.

Signed-off-by: Mark Thompson <sw@jkqxz.net>
3 years agodecklink: enhancement: format selection with AVRational v2
Matthias Hunstock [Sun, 10 Jul 2016 11:02:37 +0000 (13:02 +0200)]
decklink: enhancement: format selection with AVRational v2

When finding a video mode based on frame size and frame rate,
use AVRational methods instead of simple comparison. Add debug information.

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodecklink: fix: set fps on video stream v2
Matthias Hunstock [Sun, 10 Jul 2016 11:02:36 +0000 (13:02 +0200)]
decklink: fix: set fps on video stream v2

Provide the stream with the correct fps information when capturing.

Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/teeproto: set forgotten url_close()
Michael Niedermayer [Fri, 5 Aug 2016 16:59:21 +0000 (18:59 +0200)]
avformat/teeproto: set forgotten url_close()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agolavf: forward protocol_whitelist for the remaining cases
Andreas Cadhalpun [Wed, 3 Feb 2016 00:01:34 +0000 (01:01 +0100)]
lavf: forward protocol_whitelist for the remaining cases

Also set a default_whitelist for mmsh and ffrtmphttp.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavfilter/avf_showspectrum: add color rotation feature
Paul B Mahol [Fri, 5 Aug 2016 10:14:38 +0000 (12:14 +0200)]
avfilter/avf_showspectrum: add color rotation feature

Mostly useful with channel color scheme.

3 years agoSupport for MIPS cpu P6600
Shivraj Patil [Fri, 5 Aug 2016 08:12:44 +0000 (13:42 +0530)]
Support for MIPS cpu P6600

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/img2enc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
Michael Niedermayer [Wed, 3 Aug 2016 18:36:14 +0000 (20:36 +0200)]
avformat/img2enc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/hlsenc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
Michael Niedermayer [Wed, 3 Aug 2016 18:35:53 +0000 (20:35 +0200)]
avformat/hlsenc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat: Add av_get_frame_filename2() and AV_FRAME_FILENAME_FLAGS_MULTIPLE
Michael Niedermayer [Wed, 3 Aug 2016 18:34:20 +0000 (20:34 +0200)]
avformat: Add av_get_frame_filename2() and AV_FRAME_FILENAME_FLAGS_MULTIPLE

This will be used to allow writing file sequences using the tee output onto
multiple places in parallel

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavcodec/vdpau: clean up vdpau_internal.h
James Almer [Wed, 3 Aug 2016 04:20:52 +0000 (01:20 -0300)]
avcodec/vdpau: clean up vdpau_internal.h

Also don't include it on files that don't need it.

This reduces differences with libav

Tested-by: Timothy Gu <timothygu99@gmail.com>
Reveiwed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat: add a TTA Muxer
James Almer [Thu, 4 Aug 2016 19:21:25 +0000 (16:21 -0300)]
avformat: add a TTA Muxer

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/tta: remove custom crc callback function
James Almer [Thu, 4 Aug 2016 19:17:44 +0000 (16:17 -0300)]
avformat/tta: remove custom crc callback function

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavformat/avio: add a crc callback function for CRC-32 IEEE-LE
James Almer [Thu, 4 Aug 2016 19:17:09 +0000 (16:17 -0300)]
avformat/avio: add a crc callback function for CRC-32 IEEE-LE

Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoh264dec: Fix indentation
Timothy Gu [Thu, 4 Aug 2016 18:16:44 +0000 (11:16 -0700)]
h264dec: Fix indentation

3 years agoffmpeg_opt: Remove duplicated initialization of attachment stream
Timothy Gu [Thu, 4 Aug 2016 04:29:38 +0000 (21:29 -0700)]
ffmpeg_opt: Remove duplicated initialization of attachment stream

These two fields are already initialized to the same values in
new_attachment_stream().

3 years agoMerge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'
Timothy Gu [Thu, 4 Aug 2016 04:28:13 +0000 (21:28 -0700)]
Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'

* commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae':
  avconv: fix handling attachments in init_output_stream

Conflicts:
avconv.c

This is functionally a no-op, as we don't have the bug this is trying to
fix. See 843be56ee18928ecf80bcb20d235c4f9cab5a8fd.

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoMerge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
Timothy Gu [Thu, 4 Aug 2016 03:53:03 +0000 (20:53 -0700)]
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge

* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
  avconv: create simple filtergraphs earlier

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoMerge commit '49670e4218d34899a1c37abb7a11615efc16f757'
Timothy Gu [Thu, 4 Aug 2016 03:33:57 +0000 (20:33 -0700)]
Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'

* commit '49670e4218d34899a1c37abb7a11615efc16f757':
  avconv: add a function for determining whether a filtergraph is simple

Conflicts:
avconv.c

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoMerge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'
Timothy Gu [Thu, 4 Aug 2016 03:07:21 +0000 (20:07 -0700)]
Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'

* commit '58640fe89ec4f2a3d67c0a2585fca8de34440857':
  h264: handle frame recovery in h264_field_start()

Conflicts:
libavcodec/h264dec.c

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoMerge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'
Timothy Gu [Thu, 4 Aug 2016 02:46:06 +0000 (19:46 -0700)]
Merge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'

* commit 'e26c64148be8a20ace7512d96503172fb5e9753b':
  h264: discard slices of redundant pictures right after parsing the slice header

Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c

TODO: fix indentation

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoMerge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'
Timothy Gu [Thu, 4 Aug 2016 02:09:19 +0000 (19:09 -0700)]
Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'

* commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0':
  h264: always set redundant_pic_count during slice header parsing

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoMerge commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff'
Timothy Gu [Thu, 4 Aug 2016 00:47:06 +0000 (17:47 -0700)]
Merge commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff'

* commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff':
  h264: call the hwaccel frame_start() from h264_field_start()

This commit is a noop, as it conflicts with 3e53211a578fc6b042ceff45b2702335294e0464.

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoRevert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""
Timothy Gu [Thu, 4 Aug 2016 00:45:36 +0000 (17:45 -0700)]
Revert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""

This reverts commit e4af9be0f45c8f2ca148fb971f1e0c6782530e8c and redoes
796027f22154c799e0063e2457b31e0cfd1dddae.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoRevert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"
Timothy Gu [Thu, 4 Aug 2016 00:06:43 +0000 (17:06 -0700)]
Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"

This reverts commit 796027f22154c799e0063e2457b31e0cfd1dddae, reversing
changes made to bca30ed2b67f095fd31e07319a622ac30ad22978.

Preemptive revert before further testing has been done.

3 years agoMerge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'
Timothy Gu [Wed, 3 Aug 2016 22:59:51 +0000 (15:59 -0700)]
Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'

* commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22':
  h264: fix the check for mixed IDR/non-IDR slices

Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoMerge commit 'b13fc1e344011949929975a3451f78f226aa1de3'
Timothy Gu [Wed, 3 Aug 2016 22:41:59 +0000 (15:41 -0700)]
Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'

* commit 'b13fc1e344011949929975a3451f78f226aa1de3':
  h264: do not pass H264Context to h264_slice_header_parse()

Conflicts:
libavcodec/h264dec.h

Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.

Merged-by: Timothy Gu <timothygu99@gmail.com>
3 years agoavfilter/af_astats: extend bitdepth calculation
Paul B Mahol [Wed, 3 Aug 2016 18:27:28 +0000 (20:27 +0200)]
avfilter/af_astats: extend bitdepth calculation

3 years agoavformat/teeproto: Support parsing protocol options
Michael Niedermayer [Mon, 1 Aug 2016 00:34:23 +0000 (02:34 +0200)]
avformat/teeproto: Support parsing protocol options

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoavformat/oggdec: Fix integer overflow with invalid pts
Michael Niedermayer [Wed, 3 Aug 2016 11:34:40 +0000 (13:34 +0200)]
avformat/oggdec: Fix integer overflow with invalid pts

If negative pts are possible for some codecs in ogg then the code needs to be
changed to use signed values.

Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoffplay: Fix invalid array index
Michael Niedermayer [Wed, 3 Aug 2016 11:15:14 +0000 (13:15 +0200)]
ffplay: Fix invalid array index

Found-by: Thomas Guilbert <tguilbert@google.com>
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agodoc/filters: Fix option ranges for the sab filter.
Carl Eugen Hoyos [Wed, 3 Aug 2016 13:20:38 +0000 (15:20 +0200)]
doc/filters: Fix option ranges for the sab filter.

Fixes ticket #5751.

3 years agodecklink: Remove unneeded spaces in initializers
Patrick Felt [Wed, 3 Aug 2016 05:46:28 +0000 (22:46 -0700)]
decklink: Remove unneeded spaces in initializers

3 years agoaf_hdcd: add flags to AVOption defs
Burt P [Mon, 1 Aug 2016 15:56:04 +0000 (10:56 -0500)]
af_hdcd: add flags to AVOption defs

Signed-off-by: Burt P <pburt0@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
3 years agomediacodec: Return ENOSYS on unsupported platforms
Timothy Gu [Wed, 3 Aug 2016 03:48:16 +0000 (20:48 -0700)]
mediacodec: Return ENOSYS on unsupported platforms

3 years agojni: Return ENOSYS on unsupported platforms
Timothy Gu [Wed, 3 Aug 2016 03:47:55 +0000 (20:47 -0700)]
jni: Return ENOSYS on unsupported platforms

3 years agodoxygen: Standardize root-level modules
Timothy Gu [Wed, 3 Aug 2016 05:05:27 +0000 (22:05 -0700)]
doxygen: Standardize root-level modules

3 years agomathematics: Extend and edit Doxygen
Timothy Gu [Sun, 31 Jul 2016 01:56:34 +0000 (18:56 -0700)]
mathematics: Extend and edit Doxygen

3 years agorational: Extend Doxygen
Timothy Gu [Sat, 30 Jul 2016 18:43:24 +0000 (11:43 -0700)]
rational: Extend Doxygen

3 years agoavutil/hash: Add more detailed Doxygen documentation
Timothy Gu [Tue, 2 Aug 2016 06:09:04 +0000 (23:09 -0700)]
avutil/hash: Add more detailed Doxygen documentation

3 years agoavcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.h
James Almer [Wed, 3 Aug 2016 03:36:09 +0000 (00:36 -0300)]
avcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.h

It's the proper place since 8c7932884d09bc580036640453fd6b7ad4dd77b4

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agolibavcodec/dnxhd: Enable 12-bit DNxHR support.
Steven Robertson [Tue, 2 Aug 2016 06:26:12 +0000 (23:26 -0700)]
libavcodec/dnxhd: Enable 12-bit DNxHR support.

10- and 12-bit DNxHR use the same DC coefficient decoding process and
VLC table, just with a different shift value. From SMPTE 2019-1:2016,
8.2.4 DC Coefficient Decoding:

"For 8-bit video sampling, the maximum value of η=11 and for
10-/12-bit video sampling, the maximum value of η=13."

A sample file will be uploaded to show that with this patch, things
decode correctly:
dnxhr_hqx_12bit_1080p_smpte_colorbars_davinci_resolve.mov

Signed-off-by: Steven Robertson <steven@strobe.cc>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
3 years agoDoxyfile: Set STRIP_FROM_INC_PATH to project root
Timothy Gu [Tue, 2 Aug 2016 22:10:41 +0000 (15:10 -0700)]
Doxyfile: Set STRIP_FROM_INC_PATH to project root

Show proper #include's on struct pages.

Before:

    #include <buffer.h>

After

    #include <libavutil/buffer.h>

3 years agomem: Order function prototypes semantically
Timothy Gu [Sat, 30 Jul 2016 04:46:06 +0000 (21:46 -0700)]
mem: Order function prototypes semantically

3 years agocosmetics: Correct comments in decklink_dec
Patrick Felt [Tue, 2 Aug 2016 19:39:22 +0000 (13:39 -0600)]
cosmetics: Correct comments in decklink_dec

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
3 years agox86/ttaenc: add ff_ttaenc_filter_process_{ssse3,sse4}
James Almer [Tue, 2 Aug 2016 17:54:06 +0000 (14:54 -0300)]
x86/ttaenc: add ff_ttaenc_filter_process_{ssse3,sse4}

Signed-off-by: James Almer <jamrial@gmail.com>
3 years agoavcodec/ttaenc: split off hybrid filter processing as ttaencdsp
James Almer [Tue, 2 Aug 2016 17:46:55 +0000 (14:46 -0300)]
avcodec/ttaenc: split off hybrid filter processing as ttaencdsp

Signed-off-by: James Almer <jamrial@gmail.com>