ffmpeg.git
4 years agodnxhddata: introduce and use MBAFF flag
Christophe Gisquet [Mon, 5 Oct 2015 18:44:45 +0000 (20:44 +0200)]
dnxhddata: introduce and use MBAFF flag

MBAFF-like handling of interlaced content in CID 1260 is different from
the other CIDs, and in particular doesn't use the same syntax.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_w3fdif: scale down coefficiends by 2
Paul B Mahol [Wed, 7 Oct 2015 21:27:14 +0000 (23:27 +0200)]
avfilter/vf_w3fdif: scale down coefficiends by 2

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agodnxhddec: better support for 4:4:4
Christophe Gisquet [Sun, 4 Oct 2015 08:06:28 +0000 (10:06 +0200)]
dnxhddec: better support for 4:4:4

Profiles 1256 & 1270 (currently) signal at the frame header and MB
levels the colorspace used, either RGB or YUV. While a MB-level
varying colorspace is not supported, whether it is constant can be
tracked so as to determine the exact colorspace.

This requires having bitdepth and the ACT and 4:4:4 flags, in turn
needing the CID. Because setting those before having validated
enough things may result in invalid/unset DSP fucntions, setting
the bitdepth in the context is delayed.

It is not tested against a true RGB sequence, though.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/x86/vf_blend.asm: hardmix: do same with two pxor instructions less
Paul B Mahol [Wed, 7 Oct 2015 21:12:09 +0000 (23:12 +0200)]
avfilter/x86/vf_blend.asm: hardmix: do same with two pxor instructions less

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/x86/vf_blend.asm: 11th register is used, update functions
Paul B Mahol [Wed, 7 Oct 2015 20:53:54 +0000 (22:53 +0200)]
avfilter/x86/vf_blend.asm: 11th register is used, update functions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/x86/vf_blend.asm: add hardmix and phoenix sse2 SIMD
Paul B Mahol [Wed, 7 Oct 2015 08:12:26 +0000 (10:12 +0200)]
avfilter/x86/vf_blend.asm: add hardmix and phoenix sse2 SIMD

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agolavfi/vf_yadif: reindent after last commit.
Nicolas George [Fri, 2 Oct 2015 13:58:53 +0000 (15:58 +0200)]
lavfi/vf_yadif: reindent after last commit.

4 years agolavfi/vf_thumbnail: reindent after last commit.
Nicolas George [Fri, 2 Oct 2015 14:20:17 +0000 (16:20 +0200)]
lavfi/vf_thumbnail: reindent after last commit.

4 years agolavfi/vf_w3fdif: reindent after last commit.
Nicolas George [Fri, 2 Oct 2015 14:17:56 +0000 (16:17 +0200)]
lavfi/vf_w3fdif: reindent after last commit.

4 years agolavfi/vf_alphamerge: reindent after last commit.
Nicolas George [Fri, 2 Oct 2015 14:12:51 +0000 (16:12 +0200)]
lavfi/vf_alphamerge: reindent after last commit.

4 years agolavfi/avf_showspectrum: reindent after last commit.
Nicolas George [Fri, 2 Oct 2015 14:03:16 +0000 (16:03 +0200)]
lavfi/avf_showspectrum: reindent after last commit.

4 years agolavfi/vf_yadif: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 13:54:41 +0000 (15:54 +0200)]
lavfi/vf_yadif: remove looping on request_frame().

4 years agolavfi/vf_w3fdif: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:17:41 +0000 (16:17 +0200)]
lavfi/vf_w3fdif: remove looping on request_frame().

4 years agolavfi/vf_thumbnail: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:19:55 +0000 (16:19 +0200)]
lavfi/vf_thumbnail: remove looping on request_frame().

4 years agolavfi/vf_select: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:29:08 +0000 (16:29 +0200)]
lavfi/vf_select: remove looping on request_frame().

4 years agolavfi/vf_fps: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:16:10 +0000 (16:16 +0200)]
lavfi/vf_fps: remove looping on request_frame().

4 years agolavfi/vf_alphamerge: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:12:38 +0000 (16:12 +0200)]
lavfi/vf_alphamerge: remove looping on request_frame().

4 years agolavfi/avf_showwaves: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:04:47 +0000 (16:04 +0200)]
lavfi/avf_showwaves: remove looping on request_frame().

4 years agolavfi/avf_showspectrum: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:03:02 +0000 (16:03 +0200)]
lavfi/avf_showspectrum: remove looping on request_frame().

4 years agolavfi/avf_showcqt: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 14:00:53 +0000 (16:00 +0200)]
lavfi/avf_showcqt: remove looping on request_frame().

4 years agolavfi/af_aresample: remove looping on request_frame().
Nicolas George [Fri, 2 Oct 2015 13:54:55 +0000 (15:54 +0200)]
lavfi/af_aresample: remove looping on request_frame().

4 years agoswresample/resample: manually unroll the main loop in bessel()
Michael Niedermayer [Wed, 7 Oct 2015 15:57:58 +0000 (17:57 +0200)]
swresample/resample: manually unroll the main loop in bessel()

About 10% faster

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswresample/resample: merge first iteration into init in bessel()
Michael Niedermayer [Wed, 7 Oct 2015 15:33:00 +0000 (17:33 +0200)]
swresample/resample: merge first iteration into init in bessel()

speedup of about 1%

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mips: build fix for MSA 64bit
Shivraj Patil [Wed, 7 Oct 2015 12:51:59 +0000 (18:21 +0530)]
avcodec/mips: build fix for MSA 64bit

Modified datatype of function argument (pitch from int32_t to ptrdiff_t)

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mips: build fix for MSA
Shivraj Patil [Wed, 7 Oct 2015 12:50:53 +0000 (18:20 +0530)]
avcodec/mips: build fix for MSA

Modified sps and pps access from old HEVCContext(s) structure to newly introduced HEVCParamSets(ps)

Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodoc/encoders: Fix libkvazaar documentation
Arttu Ylä-Outinen [Mon, 28 Sep 2015 08:30:06 +0000 (11:30 +0300)]
doc/encoders: Fix libkvazaar documentation

The -threads option is ignored with libkvazaar since it does not have
any of the AV_CODEC_CAP_{FRAME,SLICE,AUTO}_THREADS capabilities. This
commit removes the incorrect documentation as well as the no-op of
setting the number of threads in libkvazaar encoder.

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agolibkvazaar: Fix setting framerate
Arttu Ylä-Outinen [Mon, 28 Sep 2015 08:28:46 +0000 (11:28 +0300)]
libkvazaar: Fix setting framerate

The divisor and dividend in the equation had been swapped, making the
result the inverse of the actual framerate.

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agolibkvazaar: Use av_image_copy for copying pixels
Arttu Ylä-Outinen [Mon, 28 Sep 2015 08:27:16 +0000 (11:27 +0300)]
libkvazaar: Use av_image_copy for copying pixels

Replaces a for loop for copying pixels by a call to av_image_copy.

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agolibkvazaar: Set pts and dts
Arttu Ylä-Outinen [Mon, 28 Sep 2015 08:11:17 +0000 (11:11 +0300)]
libkvazaar: Set pts and dts

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agolibkvazaar: Replace asserts with proper errors
Arttu Ylä-Outinen [Mon, 28 Sep 2015 08:08:19 +0000 (11:08 +0300)]
libkvazaar: Replace asserts with proper errors

Changes function libkvazaar_encode to return proper error codes instead
of crashing when the video dimensions or pixel format change in the
middle of encoding.

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agolibkvazaar: Remove unnecessary NULL checks
Arttu Ylä-Outinen [Mon, 28 Sep 2015 08:03:07 +0000 (11:03 +0300)]
libkvazaar: Remove unnecessary NULL checks

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agoconfigure: Add version check for libkvazaar
Arttu Ylä-Outinen [Tue, 29 Sep 2015 11:07:10 +0000 (14:07 +0300)]
configure: Add version check for libkvazaar

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agolibkvazaar: Update to work with the latest version
Arttu Ylä-Outinen [Mon, 28 Sep 2015 07:55:14 +0000 (10:55 +0300)]
libkvazaar: Update to work with the latest version

Function encoder_encode in Kvazaar API was changed to have new output
parameters: source picture and frame info. Frame info is used to set the
keyframe flag and source picture is ignored.

Signed-off-by: Arttu Ylä-Outinen <arttu.yla-outinen@tut.fi>
4 years agovp9: don't keep a stack pointer if we don't need it.
Ronald S. Bultje [Tue, 6 Oct 2015 12:38:17 +0000 (08:38 -0400)]
vp9: don't keep a stack pointer if we don't need it.

This saves one register in a few cases on 32bit builds with unaligned
stack (e.g. MSVC), making the code slightly easier to maintain.

(Can someone please test this on 32bit+msvc and confirm make fate-vp9
and tests/checkasm/checkasm still work after this patch?)

4 years agoavcodec/libx264: silence -Waddress
Ganesh Ajjanagadde [Wed, 7 Oct 2015 02:48:13 +0000 (22:48 -0400)]
avcodec/libx264: silence -Waddress

This patch moves the pointer validity check outside the macro,
and silences the -Waddress observed with GCC 5.2.

Note that this changes the error message slightly, from:
"bad option..." to "Error parsing option...".

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agodoc/developer: use https instead of http
Ganesh Ajjanagadde [Wed, 7 Oct 2015 03:15:49 +0000 (23:15 -0400)]
doc/developer: use https instead of http

Change to https for FFmpeg websites.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/pngenc: Check that there is at least 1 frame
Michael Niedermayer [Wed, 7 Oct 2015 02:50:16 +0000 (04:50 +0200)]
avcodec/pngenc: Check that there is at least 1 frame

Fixes null pointer dereference
Fixes CID1322330

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/pngenc: Initialize fctl_chunk to 0
Michael Niedermayer [Wed, 7 Oct 2015 00:49:34 +0000 (02:49 +0200)]
avcodec/pngenc: Initialize fctl_chunk to 0

The structure is copied around and that triggers warnings if it is uninitialized
Fixes CID1322360

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/flvdec: Print stream type in case a new stream is discovered after the header
Michael Niedermayer [Wed, 7 Oct 2015 00:41:40 +0000 (02:41 +0200)]
avformat/flvdec: Print stream type in case a new stream is discovered after the header

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agocheckasm: add alacdsp tests
James Almer [Tue, 6 Oct 2015 23:25:49 +0000 (20:25 -0300)]
checkasm: add alacdsp tests

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agox86/alacdsp: add simd optimized functions
James Almer [Tue, 6 Oct 2015 23:22:00 +0000 (20:22 -0300)]
x86/alacdsp: add simd optimized functions

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavformat/httpauth: Add space after commas in HTTP/RTSP auth header
Andrey Utkin [Thu, 1 Oct 2015 10:56:31 +0000 (13:56 +0300)]
avformat/httpauth: Add space after commas in HTTP/RTSP auth header

This fixes access to Grandstream cameras, which return 401 to ffmpeg
otherwise.
VLC sends Authorization: header with spaces between parameters, and it
is known to work with Grandstream devices and broad range of other HTTP
and RTSP servers, so author considers switching to such behaviour safe.
Just for record - RFC 2617 (HTTP Auth) does not specify the need in
spaces, so this is not a bug of FFmpeg.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/vf_stereo3d: add x86 SIMD for anaglyph outputs
Paul B Mahol [Sun, 4 Oct 2015 09:34:03 +0000 (11:34 +0200)]
avfilter/vf_stereo3d: add x86 SIMD for anaglyph outputs

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoREADME: replace http with https
Ganesh Ajjanagadde [Tue, 6 Oct 2015 03:39:08 +0000 (23:39 -0400)]
README: replace http with https

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoafilter/af_extrastereo: remove dead initialization
Paul B Mahol [Tue, 6 Oct 2015 07:56:22 +0000 (09:56 +0200)]
afilter/af_extrastereo: remove dead initialization

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter:audio: fix shadowed AVFrame *out
Paul B Mahol [Tue, 6 Oct 2015 07:50:30 +0000 (09:50 +0200)]
avfilter:audio: fix shadowed AVFrame *out

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/af_extrastereo: Fix shadowed variable
Michael Niedermayer [Tue, 6 Oct 2015 01:16:24 +0000 (03:16 +0200)]
avfilter/af_extrastereo: Fix shadowed variable

Fixes CID1325675

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/flvdec: Remove dead loop
Michael Niedermayer [Mon, 5 Oct 2015 22:17:40 +0000 (00:17 +0200)]
avformat/flvdec: Remove dead loop

Fixes CID1325682

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agovp9: fix msvc build by using 6 GPRs on 32bit if stack!=aligned.
Ronald S. Bultje [Mon, 5 Oct 2015 11:39:04 +0000 (07:39 -0400)]
vp9: fix msvc build by using 6 GPRs on 32bit if stack!=aligned.

4 years agoavformat/omadec: Fix { typo
Michael Niedermayer [Mon, 5 Oct 2015 19:09:40 +0000 (21:09 +0200)]
avformat/omadec: Fix { typo

Fixes CID1324299

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffplay: use correct context for av_log
Ganesh Ajjanagadde [Mon, 5 Oct 2015 00:38:24 +0000 (20:38 -0400)]
ffplay: use correct context for av_log

Recent commits c3e8de1c248f8c742dd9e61a0c71ee56bba22c28 and
8dc6e92c3dc67a85026f3010045c7a28b1c0adc8 used av_log incorrectly.
This fixes such usage.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: more robust condition variable creation
Ganesh Ajjanagadde [Mon, 5 Oct 2015 00:38:06 +0000 (20:38 -0400)]
ffplay: more robust condition variable creation

SDL_CreateCond can fail:
https://wiki.libsdl.org/SDL_CreateCond.
This patch makes creation more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoffplay: log SDL error messages
Ganesh Ajjanagadde [Mon, 5 Oct 2015 00:37:39 +0000 (20:37 -0400)]
ffplay: log SDL error messages

This logs the SDL error messages on failure of creation of SDL_CreateMutex,
SDL_CreateCond, and SDL_CreateThread.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoavutil/attributes: add av_warn_unused_result
Ganesh Ajjanagadde [Mon, 5 Oct 2015 05:45:12 +0000 (01:45 -0400)]
avutil/attributes: add av_warn_unused_result

GCC 3.4 introduced an attribute warn_unused_result to warn when a programmer
discards the return value. Applying this judiciously across the codebase can help
in fixing a lot of problems. At a high level, functions which return error codes
should always be checked. More concretely, consider the functions ff_add_format
and the like in avfilter/formats.h. A quick examination shows that a large portion
of libavfilter fails to handle the associated errors, usually AVERROR(ENOMEM).
The above example was where I observed the utility of this, but it should be
useful in many places across the code base.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhd: add better support for CIDs 1270 to 1274
Jeremy James [Mon, 28 Sep 2015 15:28:12 +0000 (16:28 +0100)]
dnxhd: add better support for CIDs 1270 to 1274

These are DNxHR profiles with the following properties:
- Variable size in a profile (property added in a previous commit),
  requiring variable-sized macroblock table;
- Variable bitdepth, up to 12 bits.
- Better validation of buffer sizes and positions

Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhd: add CID 1270
Christophe Gisquet [Sat, 3 Oct 2015 16:59:20 +0000 (18:59 +0200)]
dnxhd: add CID 1270

This a 4:4:4 10 bits profile, where image size is not fixed by the
profile, and which strays a bit outside the old frame header parsing
code.

Fixes ticket #4581 (DNxHR is not stricly supported, but that sequence is).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhd: add decoder support for DNxHR
Jeremy James [Sat, 3 Oct 2015 16:59:19 +0000 (18:59 +0200)]
dnxhd: add decoder support for DNxHR

Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoisom: add support for DNxHR codec family
Christophe Gisquet [Sat, 3 Oct 2015 16:59:18 +0000 (18:59 +0200)]
isom: add support for DNxHR codec family

This is actually similar to DNxHD.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhddec: Introduce DNXHD_VARIABLE
Christophe Gisquet [Sat, 3 Oct 2015 16:59:17 +0000 (18:59 +0200)]
dnxhddec: Introduce DNXHD_VARIABLE

Currently not used, but will be used to indicate that a CIDEntry field
is not set, because it is variable, and that checks should be adapted.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhdenc: do not select 4:4:4 profiles
Christophe Gisquet [Sat, 3 Oct 2015 16:59:16 +0000 (18:59 +0200)]
dnxhdenc: do not select 4:4:4 profiles

The encoder can only deal with 4:2:2.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhd: profile flags
Christophe Gisquet [Sat, 3 Oct 2015 16:59:15 +0000 (18:59 +0200)]
dnxhd: profile flags

Move the 'interlaced' flag to this element (arbitrarily set to 16bits).
This should allow better detection/selection of profiles.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agodnxhddec: cleanup frame header parsing
Christophe Gisquet [Fri, 2 Oct 2015 19:00:44 +0000 (21:00 +0200)]
dnxhddec: cleanup frame header parsing

Rely more on the actual syntax from the specs (also seen in the
encoder code).

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/mmaldec: Use av_assert0() instead of assert()
Michael Niedermayer [Mon, 5 Oct 2015 10:04:40 +0000 (12:04 +0200)]
avcodec/mmaldec: Use av_assert0() instead of assert()

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoMerge commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8'
Hendrik Leppkes [Mon, 5 Oct 2015 09:34:11 +0000 (11:34 +0200)]
Merge commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8'

* commit '39f01e346cab464ef6c0d4ec58cc13b7123e60d8':
  mmaldec: be more tolerant against MMAL not returning decoded output

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '65db4899fa8790049bec3af16ecdb75dd81051fd'
Hendrik Leppkes [Mon, 5 Oct 2015 09:34:04 +0000 (11:34 +0200)]
Merge commit '65db4899fa8790049bec3af16ecdb75dd81051fd'

* commit '65db4899fa8790049bec3af16ecdb75dd81051fd':
  mmaldec: refactor to have more context per MMAL input buffer

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'eae58428bd199f7d4670bf471f56ed204430878e'
Hendrik Leppkes [Mon, 5 Oct 2015 09:33:43 +0000 (11:33 +0200)]
Merge commit 'eae58428bd199f7d4670bf471f56ed204430878e'

* commit 'eae58428bd199f7d4670bf471f56ed204430878e':
  avcodec: Do not lock during open for codecs marked as having threadsafe init

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'
Hendrik Leppkes [Mon, 5 Oct 2015 09:30:53 +0000 (11:30 +0200)]
Merge commit 'abe9adfb31566c415fd830a8d4977c79512d4385'

* commit 'abe9adfb31566c415fd830a8d4977c79512d4385':
  rangecoder: Use AV_RB16 instead of bytestream_get_be16

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b'
Hendrik Leppkes [Mon, 5 Oct 2015 09:29:22 +0000 (11:29 +0200)]
Merge commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b'

* commit 'b8b13acd70a1c1b6c044f967d78cb82f1a53887b':
  hevc: Simplify logical check

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15'
Hendrik Leppkes [Mon, 5 Oct 2015 09:28:17 +0000 (11:28 +0200)]
Merge commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15'

* commit '10aa6f9db44e96977e7155fdc3e62619e0e00a15':
  h264: Use the correct argument context in debug log

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '4628443ca3534060888dd0015b229337eac13fd2'
Hendrik Leppkes [Mon, 5 Oct 2015 09:27:07 +0000 (11:27 +0200)]
Merge commit '4628443ca3534060888dd0015b229337eac13fd2'

* commit '4628443ca3534060888dd0015b229337eac13fd2':
  h263: Drop uninitialized variable use from log message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'
Hendrik Leppkes [Mon, 5 Oct 2015 09:24:10 +0000 (11:24 +0200)]
Merge commit '1da2a20763ae9ca579d5fd20763065871ddf6311'

* commit '1da2a20763ae9ca579d5fd20763065871ddf6311':
  dvbsubdec: Fix function return type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2'
Hendrik Leppkes [Mon, 5 Oct 2015 09:21:23 +0000 (11:21 +0200)]
Merge commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2'

* commit 'cab63a8b594cdc365bb2581a12b3ac8e6dd480b2':
  dv: Mark internal frame reference as const

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '4c160fa23996c05efcd952ccfac2359311d8a1bc'
Hendrik Leppkes [Mon, 5 Oct 2015 09:19:38 +0000 (11:19 +0200)]
Merge commit '4c160fa23996c05efcd952ccfac2359311d8a1bc'

* commit '4c160fa23996c05efcd952ccfac2359311d8a1bc':
  dcadec: Always initialize return variable

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'
Hendrik Leppkes [Mon, 5 Oct 2015 09:18:31 +0000 (11:18 +0200)]
Merge commit 'bb198c4997d5036f3bf91de51e44f807115677d0'

* commit 'bb198c4997d5036f3bf91de51e44f807115677d0':
  d3d11va: make av_d3d11va_alloc_context() available at all times

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'f3202871598f59b570b31b01cfeb64b8fedbd700'
Hendrik Leppkes [Mon, 5 Oct 2015 09:18:08 +0000 (11:18 +0200)]
Merge commit 'f3202871598f59b570b31b01cfeb64b8fedbd700'

* commit 'f3202871598f59b570b31b01cfeb64b8fedbd700':
  d3d11va: check for malloc failure

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915'
Hendrik Leppkes [Mon, 5 Oct 2015 09:17:24 +0000 (11:17 +0200)]
Merge commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915'

* commit '2c3dbff1d89bbf8300c121c06524c014cb6e0915':
  avutil/avstring: Inline some tiny functions

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'
Hendrik Leppkes [Mon, 5 Oct 2015 09:12:12 +0000 (11:12 +0200)]
Merge commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae'

* commit 'f56a08559334b7eb6b3fedbc0cc741887f6067ae':
  matroskaenc: Don't write a track language tag

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '8bb376cf6b4ab8645daedb8becaa7163656436a4'
Hendrik Leppkes [Mon, 5 Oct 2015 09:08:29 +0000 (11:08 +0200)]
Merge commit '8bb376cf6b4ab8645daedb8becaa7163656436a4'

* commit '8bb376cf6b4ab8645daedb8becaa7163656436a4':
  checkasm: Fix the function name sorting algorithm

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoffserver: avoid leaking pathname at exit
Reynaldo H. Verdejo Pinochet [Mon, 5 Oct 2015 05:29:49 +0000 (22:29 -0700)]
ffserver: avoid leaking pathname at exit

Fixes Coverity CID 1325681

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: fix up rate units in server messages
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:45:49 +0000 (14:45 -0700)]
ffserver: fix up rate units in server messages

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: wrap around bandwidth exceeded msg text
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:42:27 +0000 (14:42 -0700)]
ffserver: wrap around bandwidth exceeded msg text

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: wrap around too-busy message text
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:28:01 +0000 (14:28 -0700)]
ffserver: wrap around too-busy message text

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: unify exit path in _write_index()
Reynaldo H. Verdejo Pinochet [Sun, 4 Oct 2015 21:08:57 +0000 (14:08 -0700)]
ffserver: unify exit path in _write_index()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffserver: fix line wrapping on function decls
Reynaldo H. Verdejo Pinochet [Fri, 2 Oct 2015 21:01:24 +0000 (14:01 -0700)]
ffserver: fix line wrapping on function decls

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
4 years agoffplay: more robust mutex creation
Ganesh Ajjanagadde [Sun, 4 Oct 2015 16:04:41 +0000 (12:04 -0400)]
ffplay: more robust mutex creation

SDL_CreateMutex can fail:
https://wiki.libsdl.org/SDL_CreateMutex.
This patch makes creation more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoconcatdec: fix metadata memleak on error
Marton Balint [Sat, 3 Oct 2015 21:48:38 +0000 (23:48 +0200)]
concatdec: fix metadata memleak on error

Fixes Coverity CID 1323077.

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agolibavformat/tls_securetransport: fix argument evalulation order UB
Rodger Combs [Sun, 4 Oct 2015 19:37:52 +0000 (14:37 -0500)]
libavformat/tls_securetransport: fix argument evalulation order UB

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/tta: Un-break build without threads
Michael Niedermayer [Sun, 4 Oct 2015 20:57:55 +0000 (22:57 +0200)]
avcodec/tta: Un-break build without threads

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter: add displace video filter
Paul B Mahol [Thu, 23 Jul 2015 19:25:24 +0000 (19:25 +0000)]
avfilter: add displace video filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agommaldec: be more tolerant against MMAL not returning decoded output
wm4 [Wed, 23 Sep 2015 18:27:25 +0000 (20:27 +0200)]
mmaldec: be more tolerant against MMAL not returning decoded output

In some situations, MMAL won't return a decoded frame for certain input
frames. This can happen if a frame fails to decode, or if a packet does
not actually contain a complete frame. In these situations, we would
deadlock (or actually timeout) waiting for an expected output frame,
which is not ideal. On the other hand, there are situations where we
definitely have to block to avoid deadlocks. (This mess is a
consequence of trying to map MMAL's asynchronous and flexible
dataflow to libavcodec, which is more static and rigid.)

Solve this by doing a blocking wait only if the amount of buffered data
is too big. The whole purpose of the blocking wait is to avoid excessive
buffering of input data, so we can skip it if it appears to be low. The
consequence is that libavcodec can gracefully return no frame to the
API user.

We want to track the number of full packets to make our heuristic work.
But MMAL buffers are fixed-size, requiring splitting large packets. This
is why the previous commit is needed. We use the ..._FRAME_END flag to
remember packet boundaries, but MMAL does not preserve these buffer
flags when returning buffers to the user.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agommaldec: refactor to have more context per MMAL input buffer
wm4 [Wed, 23 Sep 2015 18:27:24 +0000 (20:27 +0200)]
mmaldec: refactor to have more context per MMAL input buffer

The next commit needs 1 bit of additional information per MMAL buffer
sent to the MMAL input port. This information will be needed when the
buffer is recycled (i.e. returned by the input port's callback).
Normally, we could use MMAL_BUFFER_HEADER_FLAG_USER0, but that is
unexpectedly not preserved.

Do this by storing a pointer to FFBufferEntry in the MMAL buffer's
user data, instead of an AVBufferRef. This also changes the lifetime
of FFBufferEntry.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavcodec/alacdec: split off decorrelate_stereo and append_extra_bits as alacdsp
James Almer [Sun, 4 Oct 2015 17:09:05 +0000 (14:09 -0300)]
avcodec/alacdec: split off decorrelate_stereo and append_extra_bits as alacdsp

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavcodec: use HAVE_THREADS header guards to silence -Wunused-function
Ganesh Ajjanagadde [Thu, 17 Sep 2015 02:22:27 +0000 (22:22 -0400)]
avcodec: use HAVE_THREADS header guards to silence -Wunused-function

When compiled with --disable-pthreads, e.g
http://fate.ffmpeg.org/report.cgi?time=20150917015044&slot=alpha-debian-qemu-gcc-4.7,
a bunch of -Wunused-functions are reported due to missing header guards
around threading related functions.
This patch should silence such warnings.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoall: add _DEFAULT_SOURCE locally wherever needed
Ganesh Ajjanagadde [Sat, 3 Oct 2015 12:41:00 +0000 (07:41 -0500)]
all: add _DEFAULT_SOURCE locally wherever needed

Glibc 2.20 onwards generates a deprecation warning for usage of _BSD_SOURCE and _SVID_SOURCE.
The solution from man feature_test_macros is to define both _DEFAULT_SOURCE and the old macros.
This solution is on the lines of the one in commit af1818276ef271af98e2e2bbabb4dc875b4fa7d8.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
4 years agoffplay: more robust thread creation
Ganesh Ajjanagadde [Sat, 3 Oct 2015 22:50:06 +0000 (18:50 -0400)]
ffplay: more robust thread creation

SDL_CreateThread can fail:
https://wiki.libsdl.org/SDL_CreateThread.
This patch makes thread creation more robust in one instance.

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoChangelog: add note on ffplay dynamic volume control
Ganesh Ajjanagadde [Sun, 4 Oct 2015 02:36:06 +0000 (22:36 -0400)]
Changelog: add note on ffplay dynamic volume control

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agocheckasm: Fix compilation with --disable-avcodec
Henrik Gramner [Thu, 1 Oct 2015 17:25:33 +0000 (19:25 +0200)]
checkasm: Fix compilation with --disable-avcodec

4 years agoavformat/flacdec: support fast-seek
Ching Yi, Chan [Thu, 24 Sep 2015 05:04:40 +0000 (13:04 +0800)]
avformat/flacdec: support fast-seek

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec: Do not lock during open for codecs marked as having threadsafe init
Derek Buitenhuis [Thu, 1 Oct 2015 14:36:56 +0000 (15:36 +0100)]
avcodec: Do not lock during open for codecs marked as having threadsafe init

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agoavfilter/ebur128: use AV_OPT_TYPE_BOOL for video option
Clément Bœsch [Sun, 4 Oct 2015 11:10:17 +0000 (13:10 +0200)]
avfilter/ebur128: use AV_OPT_TYPE_BOOL for video option