ffmpeg.git
2 years agoavcodec: add Mandsoft Screen Capture Codec decoder
Paul B Mahol [Sat, 15 Apr 2017 08:57:07 +0000 (10:57 +0200)]
avcodec: add Mandsoft Screen Capture Codec decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agodoc/encoders.texi: document libvpxenc's -row-mt
James Zern [Fri, 14 Apr 2017 01:50:51 +0000 (18:50 -0700)]
doc/encoders.texi: document libvpxenc's -row-mt

added in:
734d760e2f lavc/libvpxenc: add -row-mt option

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Zern <jzern@google.com>
2 years agoffmpeg: Clear fifo pointer on deallocation
Michael Niedermayer [Tue, 18 Apr 2017 00:12:05 +0000 (02:12 +0200)]
ffmpeg: Clear fifo pointer on deallocation

Not leaving stale pointers is more robust

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agodoc/fftools-common-opts: Fixed a typo in the common arguments list
Mickael Maison [Sun, 16 Apr 2017 15:29:48 +0000 (16:29 +0100)]
doc/fftools-common-opts: Fixed a typo in the common arguments list

    - Fixed a typo for the -sources argument

Signed-off-by: Mickael Maison <mickael.maison@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agomatroskadec,cosmetics: fix a couple typos
James Zern [Mon, 17 Apr 2017 17:59:31 +0000 (10:59 -0700)]
matroskadec,cosmetics: fix a couple typos

Signed-off-by: James Zern <jzern@google.com>
2 years agowebm_dash_manifest: Add option to specify bandwidth
Vignesh Venkatasubramanian [Wed, 12 Apr 2017 04:33:28 +0000 (21:33 -0700)]
webm_dash_manifest: Add option to specify bandwidth

Add an option to webm_dash_manifest demuxer to specify a value for
"bandwidth" field in the DASH manifest. The value is then used by
the muxer. Fixes an existing FIXME in the code.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: James Zern <jzern@google.com>
2 years agoMerge commit '47e547b321338c73c21fa623789f1efbd80a297a'
Clément Bœsch [Mon, 17 Apr 2017 12:01:31 +0000 (14:01 +0200)]
Merge commit '47e547b321338c73c21fa623789f1efbd80a297a'

* commit '47e547b321338c73c21fa623789f1efbd80a297a':
  lavc: add a null bitstream filter

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'
Clément Bœsch [Mon, 17 Apr 2017 11:57:08 +0000 (13:57 +0200)]
Merge commit '0309ddcfb25fd44883bfcdb07509eb4907576b97'

* commit '0309ddcfb25fd44883bfcdb07509eb4907576b97':
  lavc: handle MP3 in get_audio_frame_duration()

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'
Clément Bœsch [Mon, 17 Apr 2017 11:55:50 +0000 (13:55 +0200)]
Merge commit '6aa4ba7131b6e8668e33430e18101a051fe492eb'

* commit '6aa4ba7131b6e8668e33430e18101a051fe492eb':
  dxva2: Keep code shared between dxva2 and d3d11va under the correct #if

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'b0e6b3f4777910d61083976aa9fc78a1e0731aae'
Clément Bœsch [Mon, 17 Apr 2017 11:54:05 +0000 (13:54 +0200)]
Merge commit 'b0e6b3f4777910d61083976aa9fc78a1e0731aae'

* commit 'b0e6b3f4777910d61083976aa9fc78a1e0731aae':
  hevc: ppc: Add HEVC 4x4 IDCT for PowerPC

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'fc368497f2fff54ddf5316224c573c9d1939fb25'
Clément Bœsch [Mon, 17 Apr 2017 11:45:21 +0000 (13:45 +0200)]
Merge commit 'fc368497f2fff54ddf5316224c573c9d1939fb25'

* commit 'fc368497f2fff54ddf5316224c573c9d1939fb25':
  configure: Add missing dxva2 dependency for dxva2_lib

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f1248fae90b45501af4e8743d373e79191470331'
Clément Bœsch [Mon, 17 Apr 2017 11:42:33 +0000 (13:42 +0200)]
Merge commit 'f1248fae90b45501af4e8743d373e79191470331'

* commit 'f1248fae90b45501af4e8743d373e79191470331':
  configure: Handle dxva2 optional components in the standard way

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6'
Clément Bœsch [Mon, 17 Apr 2017 10:54:46 +0000 (12:54 +0200)]
Merge commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6'

* commit 'a6901b9c6bd51396c1159f1a07f9f5042328cda6':
  Drop libxvid rate control support for mpegvideo encoding

This commit is a noop, there is no known issue with it.

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'
Clément Bœsch [Mon, 17 Apr 2017 08:32:45 +0000 (10:32 +0200)]
Merge commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1'

* commit 'ac648bb835edd3f67bda2267d0e72e5e582eb5a1':
  dxva2: Simplify some ifdefs

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '7d81698b89172d2dcf1b78d4b42ba86262360559'
Clément Bœsch [Mon, 17 Apr 2017 08:28:54 +0000 (10:28 +0200)]
Merge commit '7d81698b89172d2dcf1b78d4b42ba86262360559'

* commit '7d81698b89172d2dcf1b78d4b42ba86262360559':
  vaapi_h265: Fix CFR mode with framerate set in AVCodecContext

This commit is a noop, see 37de9ce713ebb65d8b040f4f83ba7542f0754485

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'ade370a4d7eab1866b6023c91c135d27c77ca465'
Clément Bœsch [Mon, 17 Apr 2017 08:28:03 +0000 (10:28 +0200)]
Merge commit 'ade370a4d7eab1866b6023c91c135d27c77ca465'

* commit 'ade370a4d7eab1866b6023c91c135d27c77ca465':
  lavfi: Add VAAPI deinterlacer

This commit is a noop, see 359586f14f46bf3f9c1ae3375d80e8c0fc377bef

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'f8a1ead0ae4402df0503c83f213f57b785a5f20f'
Clément Bœsch [Mon, 17 Apr 2017 08:27:18 +0000 (10:27 +0200)]
Merge commit 'f8a1ead0ae4402df0503c83f213f57b785a5f20f'

* commit 'f8a1ead0ae4402df0503c83f213f57b785a5f20f':
  build: Add -D_XOPEN_SOURCE=600 to CPPFLAGS on Cygwin

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed'
Clément Bœsch [Mon, 17 Apr 2017 08:26:42 +0000 (10:26 +0200)]
Merge commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed'

* commit '39fbcf8f76ff2e7cd8d09307e6aacc70ce8f5fed':
  configure: Fix _libs vs. _extralibs oversight

This commit is a noop, see 9bf3d8408937e101921b3a0090cd6ae116b0c41f

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5'
Clément Bœsch [Mon, 17 Apr 2017 08:22:52 +0000 (10:22 +0200)]
Merge commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5'

* commit 'be2d555c980220e65d0ca5c3d78e6cc1e24451a5':
  build: Use _extralibs variable names instead of _libs everywhere

Merged-by: Clément Bœsch <u@pkh.me>
2 years agobuild: remove special freetype check
Clément Bœsch [Mon, 17 Apr 2017 08:00:06 +0000 (10:00 +0200)]
build: remove special freetype check

Since 52ccc4a0e was merged, it's pointless to keep our special version.

2 years agoMerge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'
Clément Bœsch [Mon, 17 Apr 2017 07:39:31 +0000 (09:39 +0200)]
Merge commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c'

* commit '0507cd5b9f3c3769645bc6e9177eaf760f490d1c':
  build: Rename host_libs/HOSTLIBS variables to host_extralibs/HOSTEXTRALIBS

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a'
Clément Bœsch [Mon, 17 Apr 2017 07:36:26 +0000 (09:36 +0200)]
Merge commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a'

* commit 'a7101eb40e69ada3872ec5aebe9c5c165745fb3a':
  configure: Simplify some library checks via check_lib()

This commit is a noop as it doesn't apply to FFmpeg:
- the nanosleep check doesn't use add_extralibs in FFmpeg
- the pthread checks check multiple functions before add the extra
  libraries

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'
Clément Bœsch [Sat, 15 Apr 2017 16:42:30 +0000 (18:42 +0200)]
Merge commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb'

* commit '1818a640cfdccd52e97edf13564f45bc3d0d93eb':
  build: Fix dependencies for alsa/jack/sndio support

Added explicit enable (which will be automatically added later on in
ee480790c) to actually fix this commit. Without the explicit enables,
alsa, jack and sndio gets disabled.

Also added jack, alsa and sndio to the have list so the HAVE_* are
populated to make (this fixes the SKIPHEADERS chunks).

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit 'af451ac0de6776e97d6a3ff95eac257b7964002e'
Clément Bœsch [Sat, 15 Apr 2017 16:38:45 +0000 (18:38 +0200)]
Merge commit 'af451ac0de6776e97d6a3ff95eac257b7964002e'

* commit 'af451ac0de6776e97d6a3ff95eac257b7964002e':
  configure: Drop redundant and partly bogus vaapi/vdpau header checks

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoMerge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'
Clément Bœsch [Sat, 15 Apr 2017 16:36:30 +0000 (18:36 +0200)]
Merge commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a'

* commit '932cc6496ef6ab0e589ea51d3adefe5b7d7f1e2a':
  vdpau: Do not #include vdpau_x11.h from the main vdpau header

Merged-by: Clément Bœsch <u@pkh.me>
2 years agoavdevice/decklink: remove pthread dependency
Aaron Levinson [Sat, 15 Apr 2017 06:41:46 +0000 (08:41 +0200)]
avdevice/decklink: remove pthread dependency

Purpose: avdevice/decklink: Removed pthread dependency by replacing
semaphore used in code appropriately.  Doing so makes it easier to
build ffmpeg using Visual C++ on Windows.  This is a contination of
Kyle Schwarz's "avdevice/decklink: Remove pthread dependency" patch
that is available at https://patchwork.ffmpeg.org/patch/2654/ .  This
patch wasn't accepted, and as far as I can tell, there was no
follow-up after it was rejected.

Notes: Used Visual Studio 2015 (with update 3) for this.

Comments:

-- configure: Eliminated pthreads dependency for decklink_indev_deps
   and decklink_outdev_deps and replaced with threads dependency

-- libavdevice/decklink_common.cpp / .h:
a) Eliminated semaphore and replaced with a combination of a mutex,
   condition variable, and a counter (frames_buffer_available_spots).
b) Removed include of pthread.h and semaphore.h and now using
   libavutil/thread.h instead.

-- libavdevice/decklink_dec.cpp: Eliminated include of pthread.h and
   semaphore.h.

-- libavdevice/decklink_enc.cpp:
a) Eliminated include of pthread.h and semaphore.h.
b) Replaced use of semaphore with the equivalent using a combination
   of a mutex, condition variable, and a counter
   (frames_buffer_available_spots).  In theory, libavutil/thread.h and
   the associated code could have been modified instead to add
   cross-platform implementations of the sem_ functions, but an
   inspection of the ffmpeg source base indicates that there are only
   two cases in which semaphores are used (including this one that was
   replaced), so it was deemed to not be worth the effort.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoffplay: fix indentation
Marton Balint [Wed, 15 Mar 2017 02:19:41 +0000 (03:19 +0100)]
ffplay: fix indentation

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoffplay: convert to new decode API
Marton Balint [Wed, 15 Mar 2017 02:14:55 +0000 (03:14 +0100)]
ffplay: convert to new decode API

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavcodec/dnxhdenc: fix recent regression
Paul B Mahol [Sat, 15 Apr 2017 07:22:52 +0000 (09:22 +0200)]
avcodec/dnxhdenc: fix recent regression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agolavc/opus_pvq: Add missing copyright notices from libopus.
Carl Eugen Hoyos [Fri, 14 Apr 2017 22:32:43 +0000 (00:32 +0200)]
lavc/opus_pvq: Add missing copyright notices from libopus.

The file is based on libopus, analyzed by Rostislav Pehlivanov.

2 years agoavformat/hlsenc: add hls encrypt options
Steven Liu [Fri, 14 Apr 2017 15:30:29 +0000 (23:30 +0800)]
avformat/hlsenc: add hls encrypt options

refer to:
https://git.libav.org/?p=libav.git;a=commitdiff;h=0a4b9d0ccd10b3c39105f99bd320f696f69a75a2
add hls encrypt options looks like libav's libavformat/hlsenc.c

Reviewed-by: Moritz Barsnick <barsnick@gmx.net>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agoavcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()
Paul B Mahol [Fri, 14 Apr 2017 14:09:07 +0000 (16:09 +0200)]
avcodec/dnxhd*: add ff_dnxhd_get_hr_frame_size()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/dnxhdenc: make sure that mb_height > 255 can be stored
Paul B Mahol [Fri, 14 Apr 2017 14:00:35 +0000 (16:00 +0200)]
avcodec/dnxhdenc: make sure that mb_height > 255 can be stored

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoopus_pvq: add resynth support and band encoding cost function
Rostislav Pehlivanov [Wed, 12 Apr 2017 22:26:34 +0000 (23:26 +0100)]
opus_pvq: add resynth support and band encoding cost function

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
2 years agobuild: fix tools build dependencies
James Almer [Fri, 14 Apr 2017 00:03:41 +0000 (21:03 -0300)]
build: fix tools build dependencies

Found-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'
James Almer [Thu, 13 Apr 2017 22:57:31 +0000 (19:57 -0300)]
Merge commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360'

* commit '92e6b31c3b31be5d6fcad6bf0030bea86a1c8360':
  dxva2: Adjust multiple inclusion guard names to follow convention

This commit is a noop, see 180f9a09588d1c68983692bb5245213956fdde11

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'
James Almer [Thu, 13 Apr 2017 22:56:17 +0000 (19:56 -0300)]
Merge commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390'

* commit 'dbfe60caca2e8323efa7aba6762dce7be2eba390':
  vf_hwupload_cuda: Add min/max limits for device option

This commit is a noop, see4df5a6a26a8aa08bbc6d027c2fb44fcf870e98d7

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '4efea4ce75fbea3e5f8be8040068bfaaffbb2718'
James Almer [Thu, 13 Apr 2017 22:53:14 +0000 (19:53 -0300)]
Merge commit '4efea4ce75fbea3e5f8be8040068bfaaffbb2718'

* commit '4efea4ce75fbea3e5f8be8040068bfaaffbb2718':
  APIChanges: Mention where release 12 was cut

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3f75e5116b900f1428aa13041fc7d6301bf1988a'
James Almer [Thu, 13 Apr 2017 22:49:20 +0000 (19:49 -0300)]
Merge commit '3f75e5116b900f1428aa13041fc7d6301bf1988a'

* commit '3f75e5116b900f1428aa13041fc7d6301bf1988a':
  avio: Keep track of the amount of data written

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'fc85646ad495f3418042468da415af73a7a07334'
James Almer [Thu, 13 Apr 2017 22:04:26 +0000 (19:04 -0300)]
Merge commit 'fc85646ad495f3418042468da415af73a7a07334'

* commit 'fc85646ad495f3418042468da415af73a7a07334':
  libopusdec: fix out-of-bounds read
  libschroedingerdec: fix leaking of framewithpts
  libschroedingerdec: don't produce empty frames

This commit is a noop, see

a86ebbf7f641bc797002ddea7fb517759722cd1b
3c0328d58d98664b05efdd377d3fe66a569d385e
8c8f543b81aa2b50bb6a6cfd370a0061281492a3

Merged-by: James Almer <jamrial@gmail.com>
2 years agoSupport building C++ files with MSVC
Aaron Levinson [Thu, 13 Apr 2017 09:38:02 +0000 (02:38 -0700)]
Support building C++ files with MSVC

Made appropriate changes to be able to successfully
build C++ files using a Visual C++ build on Windows.

Based on an earlier patch by Kyle Schwarz.

Comments:

-- compat/w32pthreads.h: Made appropriate changes to w32pthreads.h to
   get it to build when it is being included in a C++ file and built
   with Visual C++.  This is mostly a copy of Kyle Schwarz's patch as
   described above.

-- configure:
a) Now calling set_ccvars CXX to cause the various CXX_ variables to
   be setup properly.  For example, with MSVC (Microsoft Visual C++),
   this causes CXX_O to be set to -Fo$@ instead of using the default
   value.  The default value does not work with Visual C++.  This
   change will also have the impact of correcting CXX_O (and possibly
   CXX_C) for other compilers, although this is really only relevant
   for the Intel compiler, in addition to MSVC.
b) Now using cl for the C++ compiler for the MSVC toolchain.  This is
   currently only relevant for building the
   Blackmagic/Decklink-related files under avdevice.

Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agoMerge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'
James Almer [Thu, 13 Apr 2017 21:31:44 +0000 (18:31 -0300)]
Merge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'

* commit 'd3da8a0035734529c4e26696c9a0c6cb56633838':
  omx: Fix allocation check

This commit is a noop, see 16a75304fe42d3a007c78126b6370c94ccf891f6

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3'
James Almer [Thu, 13 Apr 2017 21:29:26 +0000 (18:29 -0300)]
Merge commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3'

* commit 'd32bdadda86b35c2960e4de877cf081b9d2dadb3':
  qsvdec: Fix memory leak on error

This commit is a noop, see b6f80b16d1a82463a77352b8756e1cdcaa3a33d0

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '6a93b596c5c3af31b843d63013a7985ffeea354d'
James Almer [Thu, 13 Apr 2017 21:27:20 +0000 (18:27 -0300)]
Merge commit '6a93b596c5c3af31b843d63013a7985ffeea354d'

* commit '6a93b596c5c3af31b843d63013a7985ffeea354d':
  compat/atomics: add typecasts in atomic_compare_exchange_strong()

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '2170017a1cd033b6f28e16476921022712a522d8'
James Almer [Thu, 13 Apr 2017 21:25:30 +0000 (18:25 -0300)]
Merge commit '2170017a1cd033b6f28e16476921022712a522d8'

* commit '2170017a1cd033b6f28e16476921022712a522d8':
  avutil: fix data race in av_get_cpu_flags()

This commit is a noop, see fed50c4304eecb352e29ce789cdb96ea84d6162f

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'd5759701a82926059ae3e2530805e900041a5419'
James Almer [Thu, 13 Apr 2017 21:18:54 +0000 (18:18 -0300)]
Merge commit 'd5759701a82926059ae3e2530805e900041a5419'

* commit 'd5759701a82926059ae3e2530805e900041a5419':
  libkvazaar: Add missing header #includes

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '892acc70105df9e6f7773bdde85b3e9541098525'
James Almer [Thu, 13 Apr 2017 21:17:09 +0000 (18:17 -0300)]
Merge commit '892acc70105df9e6f7773bdde85b3e9541098525'

* commit '892acc70105df9e6f7773bdde85b3e9541098525':
  configure: Fail if cuda was enabled and is not available

This commit is a noop. Our CUDA implementation is autodectected.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoconfigure: add missing golomb dependency to hevcparse
James Almer [Thu, 13 Apr 2017 21:15:39 +0000 (18:15 -0300)]
configure: add missing golomb dependency to hevcparse

Based on a dependency addition from fbec58daa2351cbe9fc758d8735c23ff03313db4

2 years agoMerge commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'
James Almer [Thu, 13 Apr 2017 21:14:04 +0000 (18:14 -0300)]
Merge commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a'

* commit 'f55c0a64ae40dc8e0a131a590e123cd14d0c0f7a':
  build: Drop stray golomb dependencies

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4'
James Almer [Thu, 13 Apr 2017 20:56:55 +0000 (17:56 -0300)]
Merge commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4'

* commit 'fbec58daa2351cbe9fc758d8735c23ff03313db4':
  build: Add an internal component for hevc_ps code

This commit is a noop, see 498e9e8e2a67e022c189f44fa33350b4f4a7979b

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f912fd767e55bbb5a1554bd99bacab007659609c'
James Almer [Thu, 13 Apr 2017 20:54:02 +0000 (17:54 -0300)]
Merge commit 'f912fd767e55bbb5a1554bd99bacab007659609c'

* commit 'f912fd767e55bbb5a1554bd99bacab007659609c':
  Add missing #includes for standalone spherical-information-related headers
  fate: Add spherical and stereo3d mov tests
  avprobe: Allow specifying multiple stream entries to be shown

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'e90137c045721a1635cc241eb1e1be1126389c38'
James Almer [Thu, 13 Apr 2017 20:49:44 +0000 (17:49 -0300)]
Merge commit 'e90137c045721a1635cc241eb1e1be1126389c38'

* commit 'e90137c045721a1635cc241eb1e1be1126389c38':
  mov: Export spherical information
  lavc: Add spherical packet side data API
  lavu: Add AVSphericalMapping type and frame side data

This commit is a noop, see
8f58ecc344a92e63193c38e28c173be987954bbb
e7a6f8c972a0b5b98ef7bbf393e95c434e9e2539
4dcdecf4719a9893f3825ebbad80b2af5aa23613

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'
James Almer [Thu, 13 Apr 2017 20:31:15 +0000 (17:31 -0300)]
Merge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'

* commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8':
  lavu: Add a video section to Doxygen documentation

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'
James Almer [Thu, 13 Apr 2017 20:27:43 +0000 (17:27 -0300)]
Merge commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb'

* commit '624aa8ab221cf34693f9a8c5ab67219cf560f2bb':
  build: Add missing Makefile entries and ifdefs for QSV hwaccels

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'
James Almer [Thu, 13 Apr 2017 20:22:58 +0000 (17:22 -0300)]
Merge commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b'

* commit 'c833c2034f4ee77fe2ee3470f3f5f84415673b3b':
  build: Ensure that the "all" target appears before all Makefile includes

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'
James Almer [Thu, 13 Apr 2017 20:20:50 +0000 (17:20 -0300)]
Merge commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a'

* commit '6bd9590b33742f1cceecc0c0d81b3caf3d8a4e1a':
  build: Have old H.264/HEVC nvenc encoders select their new counterparts

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '3e105d08848162b90d886bde59c010d4b0362a4b'
James Almer [Thu, 13 Apr 2017 20:09:52 +0000 (17:09 -0300)]
Merge commit '3e105d08848162b90d886bde59c010d4b0362a4b'

* commit '3e105d08848162b90d886bde59c010d4b0362a4b':
  build: Move entries related to building TOOLS to a subdirectory Makefile

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '4104cc56225f29ce1cded8b2876f8748460232a6'
James Almer [Thu, 13 Apr 2017 20:06:05 +0000 (17:06 -0300)]
Merge commit '4104cc56225f29ce1cded8b2876f8748460232a6'

* commit '4104cc56225f29ce1cded8b2876f8748460232a6':
  build: Warn that reconfiguration is necessary if version.h files changed

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6'
James Almer [Thu, 13 Apr 2017 20:03:31 +0000 (17:03 -0300)]
Merge commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6'

* commit 'f22da2cdf90dc892d483e2d4003cffc0500816f6':
  configure: add -fPIE instead of -pie to C flags for ThreadSanitizer

This commit is a noop, see 3f55752cd566c68ff3d3ae984a3936c1d08ef8ca

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'
James Almer [Thu, 13 Apr 2017 20:01:01 +0000 (17:01 -0300)]
Merge commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e'

* commit '404cb74793284aa03e2e1a7e911c980c4cba0e9e':
  configure: Pass CFLAGS_HEADERS through the right CFLAGS filter

Merged-by: James Almer <jamrial@gmail.com>
2 years agoMerge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'
Hendrik Leppkes [Thu, 13 Apr 2017 09:05:50 +0000 (11:05 +0200)]
Merge commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca'

* commit '9265364bec0af2e8b7c3a6de7bfc8291a0b70bca':
  build: Separate avisynth and avxsynth support

Mostly noop, since it could break linux configure with --enable-avisynth,
and the configure code which was simplified isn't even present in
ffmpeg.

Only merged the cosmetic re-ordering in the Makefile.

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2 years agotests: Fix gray10 and gray12 references after c1616b45.
Carl Eugen Hoyos [Thu, 13 Apr 2017 06:19:48 +0000 (08:19 +0200)]
tests: Fix gray10 and gray12 references after c1616b45.

2 years agoavcodec/aacenc_ltp: fix use of uninitialized values
James Almer [Wed, 12 Apr 2017 22:38:17 +0000 (19:38 -0300)]
avcodec/aacenc_ltp: fix use of uninitialized values

Fixes some valgrind warnings.

Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat/movenc: Fix potential leak of sgpd_entries array.
Matthew Gregan [Wed, 12 Apr 2017 02:12:17 +0000 (14:12 +1200)]
avformat/movenc: Fix potential leak of sgpd_entries array.

Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agolsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16.
Carl Eugen Hoyos [Tue, 4 Apr 2017 10:24:41 +0000 (12:24 +0200)]
lsws/utils: Make gray10 and gray12 full-scale like gray8 and gray16.

2 years agolavf/isom: Remove codec point for WMAv2 that has never worked.
Carl Eugen Hoyos [Tue, 28 Mar 2017 21:55:01 +0000 (23:55 +0200)]
lavf/isom: Remove codec point for WMAv2 that has never worked.

2 years agoconfigure: Fix decklink license dependency.
Carl Eugen Hoyos [Wed, 12 Apr 2017 20:49:06 +0000 (22:49 +0200)]
configure: Fix decklink license dependency.

2 years agoffprobe: only use custom logging callback if -show_log is set
Marton Balint [Wed, 5 Apr 2017 18:17:48 +0000 (20:17 +0200)]
ffprobe: only use custom logging callback if -show_log is set

The custom callback can cause significant CPU usage on Windows for some large
files with many index entries for some reason.

v2: Move check after parsing options.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agotests/fate/filter-video: fix framerate filter tests
Marton Balint [Sat, 8 Apr 2017 12:55:51 +0000 (14:55 +0200)]
tests/fate/filter-video: fix framerate filter tests

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agoavfilter/vf_framerate: always request input if no output is provided in request_frame
Marton Balint [Tue, 4 Apr 2017 23:41:15 +0000 (01:41 +0200)]
avfilter/vf_framerate: always request input if no output is provided in request_frame

Fixes ticket #6285.

Signed-off-by: Marton Balint <cus@passwd.hu>
2 years agox86/float_dsp: add ff_vector_fmul_reverse_avx2
James Almer [Wed, 12 Apr 2017 00:29:09 +0000 (21:29 -0300)]
x86/float_dsp: add ff_vector_fmul_reverse_avx2

~20% faster than AVX.

Signed-off-by: James Almer <jamrial@gmail.com>
2 years agodoc/APIchanges: Fill in missing fields
Michael Niedermayer [Wed, 12 Apr 2017 00:01:37 +0000 (02:01 +0200)]
doc/APIchanges: Fill in missing fields

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/movenc: Fix mix of declaration and statement
Michael Niedermayer [Tue, 11 Apr 2017 21:22:19 +0000 (23:22 +0200)]
avformat/movenc: Fix mix of declaration and statement

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agocheckasm: add fixed_dsp tests
James Almer [Tue, 11 Apr 2017 20:12:21 +0000 (17:12 -0300)]
checkasm: add fixed_dsp tests

Tested-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavformat/mo: Add experimental demuxing support for Opus in ISO BMFF (MP4).
Matthew Gregan [Thu, 16 Mar 2017 01:17:21 +0000 (14:17 +1300)]
avformat/mo: Add experimental demuxing support for Opus in ISO BMFF (MP4).

Based on the draft spec at http://vfrmaniac.fushizen.eu/contents/opus_in_isobmff.html

Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/movenc: Add experimental muxing support for Opus in ISO BMFF (MP4).
Matthew Gregan [Thu, 16 Mar 2017 01:17:12 +0000 (14:17 +1300)]
avformat/movenc: Add experimental muxing support for Opus in ISO BMFF (MP4).

Based on the draft spec at http://vfrmaniac.fushizen.eu/contents/opus_in_isobmff.html

'-strict -2' is required to create files in this format.

Signed-off-by: Matthew Gregan <kinetik@flim.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/oggparseogm: Check ff_alloc_extradata() for failure
Michael Niedermayer [Tue, 11 Apr 2017 13:08:07 +0000 (15:08 +0200)]
avformat/oggparseogm: Check ff_alloc_extradata() for failure

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavformat/oggparseogm: Check available data before reading global header
Michael Niedermayer [Tue, 11 Apr 2017 13:06:21 +0000 (15:06 +0200)]
avformat/oggparseogm: Check available data before reading global header

Fixes use of uninitialized data

Found-by: Thomas Guilbert <tguilbert@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/tiff: Factor constant computation out of inner loop
Michael Niedermayer [Tue, 11 Apr 2017 01:37:35 +0000 (03:37 +0200)]
avcodec/tiff: Factor constant computation out of inner loop

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dnxhddec: fix -Wformat warning raised by DJGPP
James Almer [Tue, 11 Apr 2017 15:08:45 +0000 (12:08 -0300)]
avcodec/dnxhddec: fix -Wformat warning raised by DJGPP

FF_ARRAY_ELEMS returns a size_t value.

Reviewed-by: ubitux
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/lcldec: mark output frames as keyframes
Paul B Mahol [Tue, 11 Apr 2017 15:07:52 +0000 (17:07 +0200)]
avcodec/lcldec: mark output frames as keyframes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavcodec/lcldec: add support for frame threads
Paul B Mahol [Tue, 11 Apr 2017 15:05:01 +0000 (17:05 +0200)]
avcodec/lcldec: add support for frame threads

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agodoc/APIChages: Add av_strireplace()
Steven Liu [Tue, 11 Apr 2017 04:46:28 +0000 (12:46 +0800)]
doc/APIChages: Add av_strireplace()

Add av_strireplace() into APIChanges

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agoavutil/avstring: improve av_strreplace implement
Steven Liu [Tue, 11 Apr 2017 02:54:35 +0000 (10:54 +0800)]
avutil/avstring: improve av_strreplace implement

Use AVBprint to implement av_strreplace
add av_strreplace test case TEST_STRREPLACE

Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2 years agoavutil/internal: Do not enable CHECKED with DEBUG
Michael Niedermayer [Fri, 7 Apr 2017 11:49:09 +0000 (13:49 +0200)]
avutil/internal: Do not enable CHECKED with DEBUG

This avoids potential undefined behavior in debug mode while still allowing
developers which want to check for potential additional overflows to do so
by manually enabling this.

Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/dnxhddec: add support for very big resolutions
Paul B Mahol [Mon, 10 Apr 2017 22:08:39 +0000 (00:08 +0200)]
avcodec/dnxhddec: add support for very big resolutions

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavfilter: add GRAY10 and GRAY12 to some filters
Paul B Mahol [Mon, 10 Apr 2017 16:12:33 +0000 (18:12 +0200)]
avfilter: add GRAY10 and GRAY12 to some filters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavfilter/vf_alphamerge: add GBRAP support
Paul B Mahol [Mon, 10 Apr 2017 15:34:19 +0000 (17:34 +0200)]
avfilter/vf_alphamerge: add GBRAP support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavfilter/vf_alphamerge: use av_image_copy_plane()
Paul B Mahol [Mon, 10 Apr 2017 15:23:49 +0000 (17:23 +0200)]
avfilter/vf_alphamerge: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agox86/float_dsp: add ff_vector_dmac_scalar_{sse2,avx,fma3}
James Almer [Mon, 10 Apr 2017 15:17:03 +0000 (12:17 -0300)]
x86/float_dsp: add ff_vector_dmac_scalar_{sse2,avx,fma3}

2 years agoavutil/float_dsp: add test for vector_dmac_scalar
James Almer [Mon, 10 Apr 2017 15:12:55 +0000 (12:12 -0300)]
avutil/float_dsp: add test for vector_dmac_scalar

2 years agoavfilter/vf_blend: add GBRAP16
Paul B Mahol [Mon, 10 Apr 2017 14:52:27 +0000 (16:52 +0200)]
avfilter/vf_blend: add GBRAP16

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoRevert "avcodec/svq1: zero initialize entries array"
Clément Bœsch [Mon, 10 Apr 2017 11:46:52 +0000 (13:46 +0200)]
Revert "avcodec/svq1: zero initialize entries array"

This reverts commit aed84ee4d1b0c9e315a84b1ee0918fa49ee9cc09.

It is a false positive from Valgrind with recent GCC and
-funswitch-loops (present in -O3).

2 years agoavformat/movenc: auto insert vp9_superframe bsf when needed
James Almer [Mon, 10 Apr 2017 04:32:18 +0000 (01:32 -0300)]
avformat/movenc: auto insert vp9_superframe bsf when needed

Experimental VP9 support was added to the muxer recently.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
2 years agoavcodec/pixlet: Reorder rlen check
Michael Niedermayer [Sat, 8 Apr 2017 01:34:45 +0000 (03:34 +0200)]
avcodec/pixlet: Reorder rlen check

This changes nothing but is nicer looking as this checks rlen

Maybe this helps coverity remove CID1397743

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavcodec/mjpegenc_huffman: Assert length in ff_mjpegenc_huffman_compute_bits()
Michael Niedermayer [Sat, 8 Apr 2017 01:34:44 +0000 (03:34 +0200)]
avcodec/mjpegenc_huffman: Assert length in ff_mjpegenc_huffman_compute_bits()

This should help coverity see that the issues this leads to cannot occur

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2 years agoavfilter/af_amix: add double sample format support
Paul B Mahol [Sun, 9 Apr 2017 20:10:14 +0000 (22:10 +0200)]
avfilter/af_amix: add double sample format support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavutil/float_dsp: add vector_dmac_scalar()
Paul B Mahol [Mon, 10 Apr 2017 09:31:11 +0000 (11:31 +0200)]
avutil/float_dsp: add vector_dmac_scalar()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavfilter/vf_paletteuse: silence warning about misaligned indentation
Paul B Mahol [Mon, 10 Apr 2017 09:25:44 +0000 (11:25 +0200)]
avfilter/vf_paletteuse: silence warning about misaligned indentation

Signed-off-by: Paul B Mahol <onemda@gmail.com>
2 years agoavfilter/vf_dctdnoiz: add GBRP support
Paul B Mahol [Sun, 9 Apr 2017 15:38:41 +0000 (17:38 +0200)]
avfilter/vf_dctdnoiz: add GBRP support

Signed-off-by: Paul B Mahol <onemda@gmail.com>