ffmpeg.git
4 years agoMerge commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78'
Hendrik Leppkes [Mon, 2 Nov 2015 10:58:27 +0000 (11:58 +0100)]
Merge commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78'

* commit '407ac22322e5ce67996ec54ef619cafa4c9ceb78':
  w32pthreads: Map MemoryBarrier to __sync_synchronize on mingw

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'a0562e531723923b632684c7b51a9dd584bf534f'
Hendrik Leppkes [Mon, 2 Nov 2015 10:58:16 +0000 (11:58 +0100)]
Merge commit 'a0562e531723923b632684c7b51a9dd584bf534f'

* commit 'a0562e531723923b632684c7b51a9dd584bf534f':
  configure: Add a SONAME entry for the android target

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8'
Hendrik Leppkes [Mon, 2 Nov 2015 10:58:01 +0000 (11:58 +0100)]
Merge commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8'

* commit 'd35d0c723e3c8fc8cde76bf677f67928f5e179a8':
  vdpau: remove dysfunctional H.263 support

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'f53583ea6e2e3fda4e4aa363f9a62cff4285affb'
Hendrik Leppkes [Mon, 2 Nov 2015 10:55:13 +0000 (11:55 +0100)]
Merge commit 'f53583ea6e2e3fda4e4aa363f9a62cff4285affb'

* commit 'f53583ea6e2e3fda4e4aa363f9a62cff4285affb':
  omadec: Fix position of opening parenthesis

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'b4a82e740743744136e07054525560351e4892ae'
Hendrik Leppkes [Mon, 2 Nov 2015 10:54:34 +0000 (11:54 +0100)]
Merge commit 'b4a82e740743744136e07054525560351e4892ae'

* commit 'b4a82e740743744136e07054525560351e4892ae':
  h264: Print the complete user message

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '8487987b87a252963b27b6adfd82887ea5933918'
Hendrik Leppkes [Mon, 2 Nov 2015 10:53:55 +0000 (11:53 +0100)]
Merge commit '8487987b87a252963b27b6adfd82887ea5933918'

* commit '8487987b87a252963b27b6adfd82887ea5933918':
  h264: Print user data SEI under normal debug verbosity

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '1720791e36f9cc24c05efea5bb275ab52156ce50'
Hendrik Leppkes [Mon, 2 Nov 2015 10:50:35 +0000 (11:50 +0100)]
Merge commit '1720791e36f9cc24c05efea5bb275ab52156ce50'

* commit '1720791e36f9cc24c05efea5bb275ab52156ce50':
  png: read and write stereo3d frame side data information

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '00b62968d079e63bf22028f253ac297292436ebe'
Hendrik Leppkes [Mon, 2 Nov 2015 10:43:50 +0000 (11:43 +0100)]
Merge commit '00b62968d079e63bf22028f253ac297292436ebe'

* commit '00b62968d079e63bf22028f253ac297292436ebe':
  os_support: Don't try to return the service name as a string in getnameinfo

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '567ca142952c5be57e52c149c815dfe5d6ac6d41'
Hendrik Leppkes [Mon, 2 Nov 2015 10:42:26 +0000 (11:42 +0100)]
Merge commit '567ca142952c5be57e52c149c815dfe5d6ac6d41'

* commit '567ca142952c5be57e52c149c815dfe5d6ac6d41':
  configure: Add -D_CRT_NONSTDC_NO_WARNINGS when building with msvc

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoavformat/segafilm: set video stream duration
Paul B Mahol [Fri, 30 Oct 2015 11:09:48 +0000 (12:09 +0100)]
avformat/segafilm: set video stream duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/segafilm: set audio stream duration
Paul B Mahol [Fri, 30 Oct 2015 11:07:44 +0000 (12:07 +0100)]
avformat/segafilm: set audio stream duration

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/segafilm: implement seeking
Paul B Mahol [Fri, 30 Oct 2015 11:07:13 +0000 (12:07 +0100)]
avformat/segafilm: implement seeking

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat: unref packet after storing it in internal packet queue
Hendrik Leppkes [Sun, 1 Nov 2015 10:08:42 +0000 (11:08 +0100)]
avformat: unref packet after storing it in internal packet queue

Fixes a memory leak when using genpts

4 years agoavformat: always unref the packet after parsing
Hendrik Leppkes [Sun, 1 Nov 2015 08:47:34 +0000 (09:47 +0100)]
avformat: always unref the packet after parsing

This fixes a memory leak when side-data is present.

4 years agoavformat/ipmovie: add context to av_log()
Paul B Mahol [Mon, 2 Nov 2015 08:00:53 +0000 (09:00 +0100)]
avformat/ipmovie: add context to av_log()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat/ipmovie: put video decoding_map_size into packet and use it in decoder
Paul B Mahol [Sun, 1 Nov 2015 16:02:26 +0000 (17:02 +0100)]
avformat/ipmovie: put video decoding_map_size into packet and use it in decoder

The size of decoding map can differ from one calculated
internally, producing artifacts while decoding video.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agovf_boxblur: Templatize blur{8,16}
Timothy Gu [Sun, 1 Nov 2015 18:20:58 +0000 (10:20 -0800)]
vf_boxblur: Templatize blur{8,16}

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavutil/eval: minor typo
Ganesh Ajjanagadde [Sun, 1 Nov 2015 03:34:15 +0000 (23:34 -0400)]
avutil/eval: minor typo

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agopixblockdsp: Use AV_COPY128U for get_pixels_16_c
Timothy Gu [Wed, 30 Sep 2015 01:34:28 +0000 (18:34 -0700)]
pixblockdsp: Use AV_COPY128U for get_pixels_16_c

Before:
  15543 decicycles in get_pixels, 4193214 runs,   1090 skips
After:
   5713 decicycles in get_pixels, 8387564 runs,   1044 skips

4 years agoavcodec/h264_slice: Disable slice threads if there are multiple access units in a...
Michael Niedermayer [Sat, 31 Oct 2015 20:36:00 +0000 (21:36 +0100)]
avcodec/h264_slice: Disable slice threads if there are multiple access units in a packet

Fixes null pointer dereference
Fixes Ticket4977

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/icecast: Initialize .str based default for AV_OPT_TYPE_STRING types
Michael Niedermayer [Sat, 31 Oct 2015 13:43:48 +0000 (14:43 +0100)]
avformat/icecast: Initialize .str based default for AV_OPT_TYPE_STRING types

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/http: Initialize .str based default for AV_OPT_TYPE_STRING types
Michael Niedermayer [Sat, 31 Oct 2015 13:42:29 +0000 (14:42 +0100)]
avformat/http: Initialize .str based default for AV_OPT_TYPE_STRING types

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libopenh264enc: use AV_OPT_TYPE_BOOL for allow_skip_frames option
Clément Bœsch [Sat, 31 Oct 2015 16:33:22 +0000 (17:33 +0100)]
avcodec/libopenh264enc: use AV_OPT_TYPE_BOOL for allow_skip_frames option

4 years agoavutil/x86/intmath: Add missing header.
Matt Oliver [Sat, 31 Oct 2015 15:00:41 +0000 (02:00 +1100)]
avutil/x86/intmath: Add missing header.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
4 years agoavcodec/nvenc: fix potential profile error when encoding yuv444p
Agatha Hu [Sat, 31 Oct 2015 15:00:39 +0000 (16:00 +0100)]
avcodec/nvenc: fix potential profile error when encoding yuv444p

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
4 years agoavutil/opencl_internal: add av_warn_unused_result
Ganesh Ajjanagadde [Sat, 31 Oct 2015 14:36:22 +0000 (10:36 -0400)]
avutil/opencl_internal: add av_warn_unused_result

clSetKernelArg can return an error due to lack of memory (for instance):
https://www.khronos.org/registry/cl/sdk/1.1/docs/man/xhtml/clSetKernelArg.html.
Thus this error must be propagated.

Currently should not trigger warnings, but adds robustness.
Untested.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavfilter/vf_deshake: replace qsort with AV_QSORT
Ganesh Ajjanagadde [Fri, 30 Oct 2015 23:07:13 +0000 (19:07 -0400)]
avfilter/vf_deshake: replace qsort with AV_QSORT

qsort is called indirectly in filter_frame, suggesting its performance
criticality. AV_QSORT is substantially faster due to the inlining of the
comparison callback. Thus, the increase in performance should be worth
the increase in binary size.

This optimization is just a low hanging fruit. The trac ticket 1430 is
a request for an improved deshake filter.

Sample benchmark (x86-64, Haswell, GNU/Linux):
File: original from https://trac.ffmpeg.org/ticket/1430
command: ffmpeg -stream_loop 8 -i file.webm -vf deshake=rx=64:ry=64 -f null -

Timer truncated at 1024 runs.
new:
28260 decicycles in qsort,       1 runs,      0 skips
35570 decicycles in qsort,       2 runs,      0 skips
39010 decicycles in qsort,       4 runs,      0 skips
46897 decicycles in qsort,       8 runs,      0 skips
40442 decicycles in qsort,      16 runs,      0 skips
41611 decicycles in qsort,      32 runs,      0 skips
40345 decicycles in qsort,      64 runs,      0 skips
38967 decicycles in qsort,     128 runs,      0 skips
38647 decicycles in qsort,     256 runs,      0 skips
40238 decicycles in qsort,     512 runs,      0 skips
39676 decicycles in qsort,    1024 runs,      0 skips

old:
1740280 decicycles in qsort,       1 runs,      0 skips
 923560 decicycles in qsort,       2 runs,      0 skips
 511330 decicycles in qsort,       4 runs,      0 skips
 309720 decicycles in qsort,       8 runs,      0 skips
 194900 decicycles in qsort,      16 runs,      0 skips
 142686 decicycles in qsort,      32 runs,      0 skips
 112516 decicycles in qsort,      64 runs,      0 skips
  98166 decicycles in qsort,     128 runs,      0 skips
  88147 decicycles in qsort,     256 runs,      0 skips
  88706 decicycles in qsort,     512 runs,      0 skips
  86783 decicycles in qsort,    1024 runs,      0 skips

Reviewed-by: Nicolas George <george@nsup.org>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavutil/x86/intmath: Use tzcnt in place of bsf.
Matt Oliver [Wed, 28 Oct 2015 07:47:16 +0000 (18:47 +1100)]
avutil/x86/intmath: Use tzcnt in place of bsf.

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
4 years agogdigrab: grab right desktop size if DPI in use, based on patch from Alexander Brotzge
Matt Oliver [Mon, 5 Oct 2015 09:00:37 +0000 (20:00 +1100)]
gdigrab: grab right desktop size if DPI in use, based on patch from Alexander Brotzge

Signed-off-by: Matt Oliver <protogonoi@gmail.com>
4 years agoavutil/rational: use frexp rather than ad-hoc log to get floating point exponent
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:18:15 +0000 (00:18 -0400)]
avutil/rational: use frexp rather than ad-hoc log to get floating point exponent

This simplifies and cleans up the code.
Furthermore, it is much faster due to absence of the slow log computation.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavdevice/caca: change AV_OPT_TYPE_STRING to set .str default
Michael Niedermayer [Sat, 31 Oct 2015 01:31:40 +0000 (02:31 +0100)]
avdevice/caca: change AV_OPT_TYPE_STRING to set .str default

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libopenh264enc: AV_OPT_TYPE_STRING should use .str default
Michael Niedermayer [Sat, 31 Oct 2015 01:29:01 +0000 (02:29 +0100)]
avcodec/libopenh264enc: AV_OPT_TYPE_STRING should use .str default

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libopenh264enc: Fix project name
Michael Niedermayer [Sat, 31 Oct 2015 01:21:58 +0000 (02:21 +0100)]
avcodec/libopenh264enc: Fix project name

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavcodec/libopenh264enc: set .i64 for AV_OPT_TYPE_INT
Michael Niedermayer [Sat, 31 Oct 2015 01:20:53 +0000 (02:20 +0100)]
avcodec/libopenh264enc: set .i64 for AV_OPT_TYPE_INT

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/avf_showcqt: Replace all fmin* and fmax* by FFMIN/FFMAX
Michael Niedermayer [Fri, 30 Oct 2015 23:16:06 +0000 (00:16 +0100)]
avfilter/avf_showcqt: Replace all fmin* and fmax* by FFMIN/FFMAX

Should fix build on x86_32-msvc2012

The alternative of emulating fmin/fmax* turns out to be non trivial

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/showcqt: fix dependency with avformat
Muhammad Faiz [Fri, 30 Oct 2015 16:35:02 +0000 (23:35 +0700)]
avfilter/showcqt: fix dependency with avformat

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoffprobe: add support for printing packet strings metadata as packet tags
Marton Balint [Sat, 24 Oct 2015 13:13:25 +0000 (15:13 +0200)]
ffprobe: add support for printing packet strings metadata as packet tags

ffprobe.xsd already contains the tag element.

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
4 years agoall: fix enum definition for large values
Ganesh Ajjanagadde [Fri, 23 Oct 2015 18:29:35 +0000 (14:29 -0400)]
all: fix enum definition for large values

ISO C restricts enumerator values to the range of int. Thus (for instance) 0x80000000
unfortunately does not work, and throws a warning with -Wpedantic on
clang 3.7.

This fixes it by using alternative expressions that result in identical
values but do not have this issue.

Tested with FATE.

Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agow32pthreads: Map MemoryBarrier to __sync_synchronize on mingw
Martin Storsjö [Wed, 28 Oct 2015 20:20:43 +0000 (22:20 +0200)]
w32pthreads: Map MemoryBarrier to __sync_synchronize on mingw

This fixes building on older mingw (both mingw.org and mingw64;
mingw64 from before May 2011).

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavutil/wchar_filename: add av_warn_unused_result
Ganesh Ajjanagadde [Fri, 16 Oct 2015 00:01:21 +0000 (20:01 -0400)]
avutil/wchar_filename: add av_warn_unused_result

Current code is fine, this just adds robustness.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavutil/mathematics: correct documentation for av_gcd
Ganesh Ajjanagadde [Wed, 28 Oct 2015 00:11:40 +0000 (20:11 -0400)]
avutil/mathematics: correct documentation for av_gcd

av_gcd is now always defined regardless of input. This documents this
change in the "documented API". Two benefits (closely related):
1. The function is robust, and there is no need to worry about INT64_MIN, etc.

2. Clients of av_gcd, like av_reduce, can now be made fully correct. Currently,
av_reduce can trigger undefined behavior if e.g num is INT64_MIN due to
integer overflow in the FFABS. Furthermore, this undefined behavior is
completely undocumented, and could be a fuzzer's paradise. The FFABS was needed in the past as
av_gcd was undefined for negative inputs. In order to make av_reduce
robust, it is essential to guarantee that av_gcd works for all int64_t.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoconfigure: Add a SONAME entry for the android target
Luca Barbato [Thu, 29 Oct 2015 13:01:07 +0000 (14:01 +0100)]
configure: Add a SONAME entry for the android target

In order to load libraries in Android they need to be unversioned.
The android target section was derived from the BSD ones, and they
that simply drop the SONAME

Android M requires to have a SONAME entry but unversioned.

4 years agovdpau: remove dysfunctional H.263 support
Rémi Denis-Courmont [Wed, 28 Oct 2015 19:21:51 +0000 (21:21 +0200)]
vdpau: remove dysfunctional H.263 support

The VDPAU API never explicitly supported H.263 in the first place.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoomadec: Fix position of opening parenthesis
Vittorio Giovara [Thu, 29 Oct 2015 13:06:06 +0000 (14:06 +0100)]
omadec: Fix position of opening parenthesis

4 years agoh264: Print the complete user message
Vittorio Giovara [Thu, 22 Oct 2015 12:13:29 +0000 (14:13 +0200)]
h264: Print the complete user message

Previously the message was cut off at 256th byte.
This will allow dumping the complete x264 encode info when needed.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoh264: Print user data SEI under normal debug verbosity
Vittorio Giovara [Thu, 22 Oct 2015 12:13:28 +0000 (14:13 +0200)]
h264: Print user data SEI under normal debug verbosity

Drop the need of setting -debug bugs since it's not a bug, and the
message is already under a AV_LOG_DEBUG log level. Instead only print
it when there is an actual string in it.

4 years agopng: read and write stereo3d frame side data information
Kirill Gavrilov [Tue, 27 Oct 2015 17:27:03 +0000 (18:27 +0100)]
png: read and write stereo3d frame side data information

Use optional sTER chunk defining side-by-side stereo pair
within "Extensions to the PNG 1.2 Specification", version 1.3.0.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoffmpeg_filter: check encoder before using it to set frame size.
Nicolas George [Sun, 25 Oct 2015 18:48:10 +0000 (19:48 +0100)]
ffmpeg_filter: check encoder before using it to set frame size.

Fix a segfault when no encoder is found for a default codec
with a complex filter graph.

4 years agoos_support: Don't try to return the service name as a string in getnameinfo
Martin Storsjö [Wed, 28 Oct 2015 20:19:12 +0000 (22:19 +0200)]
os_support: Don't try to return the service name as a string in getnameinfo

Some systems may be lacking getservbyport; the previous ifdef wasn't
quite enough since it still assumed that struct servent was defined,
as pointed out by Clément Gregoire.

Simply remove the possibility to return non-numeric services in
getnameinfo; no caller of getnameinfo within libavformat
currently try to use getnameinfo for retrieving the port number without
NI_NUMERICSERV, and falling back on getservbyport may be non-threadsafe.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agovf_lut: Add support for RGB48 and RGBA64.
Steven Robertson [Sun, 11 Oct 2015 01:27:17 +0000 (18:27 -0700)]
vf_lut: Add support for RGB48 and RGBA64.

Signed-off-by: Steven Robertson <steven@strobe.cc>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/3dostr: Remove redundant ;
Michael Niedermayer [Fri, 30 Oct 2015 02:02:41 +0000 (03:02 +0100)]
avformat/3dostr: Remove redundant ;

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavformat/oggparseogm: Enable parser for mpeg4
Michael Niedermayer [Thu, 29 Oct 2015 23:31:13 +0000 (00:31 +0100)]
avformat/oggparseogm: Enable parser for mpeg4

Fixes regression with iJi.ogv

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agolavc/proresdec2: Fix slice_count for very high resolutions.
Carl Eugen Hoyos [Fri, 30 Oct 2015 00:32:39 +0000 (01:32 +0100)]
lavc/proresdec2: Fix slice_count for very high resolutions.

QT ignores the value written in the frame header.
Issue reported by forum user Koracas.

4 years agolavc/cdg: Add transparency support.
Carl Eugen Hoyos [Fri, 30 Oct 2015 00:24:50 +0000 (01:24 +0100)]
lavc/cdg: Add transparency support.

4 years agoavutil/mathematics: make av_gcd more robust
Ganesh Ajjanagadde [Thu, 29 Oct 2015 02:02:25 +0000 (22:02 -0400)]
avutil/mathematics: make av_gcd more robust

This ensures that no undefined behavior is invoked, while retaining
identical return values in all cases and at no loss of performance
(identical asm on clang and gcc).
Essentially, this patch exchanges undefined behavior with implementation
defined behavior, a strict improvement.

Rationale:
1. The ideal solution is to have the return type a uint64_t. This
unfortunately requires an API change.
2. The only pathological behavior happens if both arguments are
INT64_MIN, to the best of my knowledge. In such a case, the
implementation defined behavior is invoked in the sense that UINT64_MAX
is interpreted as INT64_MIN, which any reasonable implementation will
do. In any case, any usage where both arguments are INT64_MIN is a
fuzzer anyway.
3. Alternatives of checking, etc require branching and lose performance
for no concrete gain - no client cares about av_gcd's actual value when
both args are INT64_MIN. Even if it did, on sane platforms (e.g all the
ones FFmpeg cares about), it produces a correct gcd, namely INT64_MIN.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavfilter/avf_showvolume: use log10 instead of log()/M_LN10
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:15:25 +0000 (00:15 -0400)]
avfilter/avf_showvolume: use log10 instead of log()/M_LN10

This is likely more precise and conveys the intent better.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoffmpeg: use log10 instead of log()/log(10)
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:01:43 +0000 (00:01 -0400)]
ffmpeg: use log10 instead of log()/log(10)

This is more concise and conveys the intent better.
Furthermore, it is likely more precise as well due to lack of floating
point division.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavfilter/vf_ssim: use log10 instead of log()/log(10)
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:17:19 +0000 (00:17 -0400)]
avfilter/vf_ssim: use log10 instead of log()/log(10)

This is likely more precise and conveys the intent better.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavfilter/avf_showspectrum: use log10 instead of log()/...
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:14:39 +0000 (00:14 -0400)]
avfilter/avf_showspectrum: use log10 instead of log()/...

This is likely more precise and conveys the intent better.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavfilter/vf_psnr: use log10 instead of log()/log(10)
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:16:34 +0000 (00:16 -0400)]
avfilter/vf_psnr: use log10 instead of log()/log(10)

This is likely more precise and conveys the intent better.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoswscale: rename sws_rgb2rgb_init to ff_sws_rgb2rgb_init
Andreas Cadhalpun [Tue, 27 Oct 2015 21:56:56 +0000 (22:56 +0100)]
swscale: rename sws_rgb2rgb_init to ff_sws_rgb2rgb_init

It is an internal swscale function and thus should not be exported.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoswscale: rename sws_context_class to ff_sws_context_class
Andreas Cadhalpun [Tue, 27 Oct 2015 21:56:53 +0000 (22:56 +0100)]
swscale: rename sws_context_class to ff_sws_context_class

It is an internal swscale symbol and thus should not be exported.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavformat: stop exporting ffurl_read_complete, ffurl_seek and ffurl_size
Andreas Cadhalpun [Tue, 27 Oct 2015 20:29:47 +0000 (21:29 +0100)]
avformat: stop exporting ffurl_read_complete, ffurl_seek and ffurl_size

They are not in public headers and not used outside of libavformat.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
4 years agoavfilter/af_volume: use log10 instead of log()/M_LN10
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:11:44 +0000 (00:11 -0400)]
avfilter/af_volume: use log10 instead of log()/M_LN10

This is likely more precise and conveys the intent better.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavcodec/zmbvenc: use log2 instead of log()/M_LN2
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:10:45 +0000 (00:10 -0400)]
avcodec/zmbvenc: use log2 instead of log()/M_LN2

This is likely more precise and conveys the intent better.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavcodec/nellymoserenc: use log2 instead of log()/M_LN2
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:06:00 +0000 (00:06 -0400)]
avcodec/nellymoserenc: use log2 instead of log()/M_LN2

This is likely more precise and conveys the intent better.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavcodec/snowenc: use log2 instead of log() / log(2...)
Ganesh Ajjanagadde [Thu, 29 Oct 2015 04:08:32 +0000 (00:08 -0400)]
avcodec/snowenc: use log2 instead of log() / log(2...)

This is likely more precise and conveys the intent better.
The expression has also been accordingly simplified.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agodoc/general.texi: fix SDX2 description
Paul B Mahol [Thu, 29 Oct 2015 20:29:47 +0000 (21:29 +0100)]
doc/general.texi: fix SDX2 description

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agodoc/general.texi: move Screenpresso to right section
Paul B Mahol [Thu, 29 Oct 2015 20:20:09 +0000 (21:20 +0100)]
doc/general.texi: move Screenpresso to right section

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat: add DC STR demuxer
Paul B Mahol [Wed, 28 Oct 2015 13:10:01 +0000 (14:10 +0100)]
avformat: add DC STR demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavcodec: add ADPCM AICA decoder
Paul B Mahol [Wed, 28 Oct 2015 13:51:27 +0000 (14:51 +0100)]
avcodec: add ADPCM AICA decoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavformat: add 3dostr demuxer
Paul B Mahol [Tue, 27 Oct 2015 19:58:23 +0000 (20:58 +0100)]
avformat: add 3dostr demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
4 years agoavfilter/tremolo: fix wavetable buffer size
Kyle Swanson [Thu, 29 Oct 2015 02:29:59 +0000 (21:29 -0500)]
avfilter/tremolo: fix wavetable buffer size

Signed-off-by: Kyle Swanson <k@ylo.ph>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoavfilter/asrc_sine: fix options typos
Kyle Swanson [Wed, 28 Oct 2015 18:03:43 +0000 (13:03 -0500)]
avfilter/asrc_sine: fix options typos

Signed-off-by: Kyle Swanson <k@ylo.ph>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoconfigure: Add -D_CRT_NONSTDC_NO_WARNINGS when building with msvc
Martin Storsjö [Wed, 28 Oct 2015 19:41:46 +0000 (21:41 +0200)]
configure: Add -D_CRT_NONSTDC_NO_WARNINGS when building with msvc

This silences warnings like this one:
libavformat/file.c(62) : warning C4996: 'read': The POSIX name for this
item is deprecated. Instead, use the ISO C++ conformant name: _read.
See online help for details.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoMerge commit '8edaf625f3c38c695c33745822182e94e17d6e1b'
Hendrik Leppkes [Thu, 29 Oct 2015 13:26:17 +0000 (14:26 +0100)]
Merge commit '8edaf625f3c38c695c33745822182e94e17d6e1b'

* commit '8edaf625f3c38c695c33745822182e94e17d6e1b':
  libopenh264enc: Count and warn about the number of skipped frames

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '9e14a992409348630ea96521411127418a92e8a3'
Hendrik Leppkes [Thu, 29 Oct 2015 13:26:07 +0000 (14:26 +0100)]
Merge commit '9e14a992409348630ea96521411127418a92e8a3'

* commit '9e14a992409348630ea96521411127418a92e8a3':
  libopenh264enc: Add an option for controlling the frame skipping

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'b8deb7c34f755d5e3eee0b5930c3a6ad2dda96bc'
Hendrik Leppkes [Thu, 29 Oct 2015 13:25:19 +0000 (14:25 +0100)]
Merge commit 'b8deb7c34f755d5e3eee0b5930c3a6ad2dda96bc'

* commit 'b8deb7c34f755d5e3eee0b5930c3a6ad2dda96bc':
  opus: Do not call vector_fmul_scalar on zero samples

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '6dcd82290438eb810936de4febd0558b38a08ec5'
Hendrik Leppkes [Thu, 29 Oct 2015 13:24:53 +0000 (14:24 +0100)]
Merge commit '6dcd82290438eb810936de4febd0558b38a08ec5'

* commit '6dcd82290438eb810936de4febd0558b38a08ec5':
  opus: Buffer the samples from the correct offset

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'f3aff31e5f66a4f1c4e34ce4944f4a402aca61ed'
Hendrik Leppkes [Thu, 29 Oct 2015 13:23:24 +0000 (14:23 +0100)]
Merge commit 'f3aff31e5f66a4f1c4e34ce4944f4a402aca61ed'

* commit 'f3aff31e5f66a4f1c4e34ce4944f4a402aca61ed':
  avpicture: Deprecate the single fields

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'cd0e08813a0484002b5defbf557c859f123953ae'
Hendrik Leppkes [Thu, 29 Oct 2015 13:21:41 +0000 (14:21 +0100)]
Merge commit 'cd0e08813a0484002b5defbf557c859f123953ae'

* commit 'cd0e08813a0484002b5defbf557c859f123953ae':
  avconv: support infinite loop for the loop option

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'a9a60106370f862e191dea58e748626da6a8fe97'
Hendrik Leppkes [Thu, 29 Oct 2015 13:18:03 +0000 (14:18 +0100)]
Merge commit 'a9a60106370f862e191dea58e748626da6a8fe97'

* commit 'a9a60106370f862e191dea58e748626da6a8fe97':
  avpacket: Provide an alloc and a free function for the struct

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6'
Hendrik Leppkes [Thu, 29 Oct 2015 13:16:44 +0000 (14:16 +0100)]
Merge commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6'

* commit '9b56d5c11488656254e9aed8d964ef2b7c2ff5e6':
  avpacket: Deprecate av_dup_packet

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agoMerge commit 'd584533cf38141172e20bae5436629ee17c8ce50'
Hendrik Leppkes [Thu, 29 Oct 2015 13:06:11 +0000 (14:06 +0100)]
Merge commit 'd584533cf38141172e20bae5436629ee17c8ce50'

* commit 'd584533cf38141172e20bae5436629ee17c8ce50':
  avformat: Rework add_to_pktbuf

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
4 years agovp9: update timestamps in ref files using multiple invisible frames.
Ronald S. Bultje [Thu, 29 Oct 2015 11:34:37 +0000 (07:34 -0400)]
vp9: update timestamps in ref files using multiple invisible frames.

For the 10-show-existing-frame, the source file indeed has a timestamp
of 3 (or 100/33) for the second visible frame, so the fix appears to
work correctly. For the other, only the timebase is fixed, but again
appears to be correct now.

4 years agolavc/mjpegdec: honor skip_frame option
Matthieu Bouron [Fri, 9 Oct 2015 13:15:15 +0000 (15:15 +0200)]
lavc/mjpegdec: honor skip_frame option

4 years agolavc/pngdec: honor skip_frame option
Matthieu Bouron [Fri, 9 Oct 2015 13:14:11 +0000 (15:14 +0200)]
lavc/pngdec: honor skip_frame option

4 years agoavfilter/showcqt: fix compilation with libswscale disabled
James Almer [Thu, 29 Oct 2015 05:11:58 +0000 (02:11 -0300)]
avfilter/showcqt: fix compilation with libswscale disabled

Signed-off-by: James Almer <jamrial@gmail.com>
4 years agoavutil/audio_fifo: add av_warn_unused_result
Ganesh Ajjanagadde [Thu, 15 Oct 2015 23:24:14 +0000 (19:24 -0400)]
avutil/audio_fifo: add av_warn_unused_result

This one should not trigger any warnings, but will be useful for future
robustness.

Strictly speaking, one could check the size after the call by examining
the structure instead of the return value. Such a use case is highly
unusual, and this commit may be easily reverted if there is a legitimate
need of such use.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agovp9_parser: don't overwrite cached timestamps with nopts.
Ronald S. Bultje [Wed, 28 Oct 2015 16:20:25 +0000 (12:20 -0400)]
vp9_parser: don't overwrite cached timestamps with nopts.

4 years agoavcodec/motion_est_template: replace qsort with AV_QSORT
Ganesh Ajjanagadde [Wed, 28 Oct 2015 02:46:18 +0000 (22:46 -0400)]
avcodec/motion_est_template: replace qsort with AV_QSORT

This code is in a performance critical section. AV_QSORT is
substantially faster due to the inlining of the comparison callback.
Thus, the increase in performance is worth the increase in binary size.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agoavutil/ripemd: make rol macro more robust by adding parentheses
Ganesh Ajjanagadde [Tue, 27 Oct 2015 23:58:41 +0000 (19:58 -0400)]
avutil/ripemd: make rol macro more robust by adding parentheses

This ensures that the macro remains correct in the sense of allowing
expressions for value and bits, by placing the value and bits expressions within
parentheses.

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
4 years agodoc/encoders: fix "the their" typo
Lou Logan [Wed, 28 Oct 2015 21:23:52 +0000 (13:23 -0800)]
doc/encoders: fix "the their" typo

Signed-off-by: Lou Logan <lou@lrcd.com>
4 years agolibopenh264enc: Count and warn about the number of skipped frames
Martin Storsjö [Wed, 28 Oct 2015 09:12:42 +0000 (11:12 +0200)]
libopenh264enc: Count and warn about the number of skipped frames

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agolibopenh264enc: Add an option for controlling the frame skipping
Martin Storsjö [Wed, 28 Oct 2015 09:06:36 +0000 (11:06 +0200)]
libopenh264enc: Add an option for controlling the frame skipping

This allows enabling the frame skipping, which is required for the
encoder to properly hit the target bitrate.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agodoc/filters: Remove article redundancy
Michael Niedermayer [Wed, 28 Oct 2015 13:20:09 +0000 (14:20 +0100)]
doc/filters: Remove article redundancy

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
4 years agoswr: do not reject channel layouts that use channel 63
wm4 [Wed, 28 Oct 2015 18:25:49 +0000 (19:25 +0100)]
swr: do not reject channel layouts that use channel 63

Channel layouts are essentially uint64_t, and every value is valid.

4 years agoopus: Do not call vector_fmul_scalar on zero samples
Kieran Kunhya [Wed, 28 Oct 2015 16:01:56 +0000 (17:01 +0100)]
opus: Do not call vector_fmul_scalar on zero samples

The x86 variant of this function crashes in that specific case.

CC: libav-devel@libav.org
4 years agoopus: Buffer the samples from the correct offset
Michael Niedermayer [Tue, 27 Oct 2015 12:47:12 +0000 (13:47 +0100)]
opus: Buffer the samples from the correct offset

When not all the opus stream have the same amount of decoded samples
process the least amount and store what is left from the other streams.

Bug-Id: 909
CC: libav-stable@libav.org
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
4 years agolavu/aes: test CBC functionality
Rodger Combs [Mon, 12 Oct 2015 03:15:52 +0000 (22:15 -0500)]
lavu/aes: test CBC functionality