ffmpeg.git
5 years agoMerge commit '28eddef689f2b4843a84f7d05fd9614246f92cc4'
Michael Niedermayer [Thu, 23 Apr 2015 19:57:12 +0000 (21:57 +0200)]
Merge commit '28eddef689f2b4843a84f7d05fd9614246f92cc4'

* commit '28eddef689f2b4843a84f7d05fd9614246f92cc4':
  hq_hqa: Validate get_vlc2 return value

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'
Michael Niedermayer [Thu, 23 Apr 2015 19:31:06 +0000 (21:31 +0200)]
Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'

* commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6':
  avcodec: Free the default avoptions on init failure

See: 1907ff0a67edeb98d9153aac79f35961837ba3f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'aef0be08756e00f363c524453c948a6e2a348614'
Michael Niedermayer [Thu, 23 Apr 2015 19:17:08 +0000 (21:17 +0200)]
Merge commit 'aef0be08756e00f363c524453c948a6e2a348614'

* commit 'aef0be08756e00f363c524453c948a6e2a348614':
  avcodec: Unref the dummy buffer on the fail path

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8eb57dc9d5ea13c12573e0759da0f7e79825af98'
Michael Niedermayer [Thu, 23 Apr 2015 19:08:58 +0000 (21:08 +0200)]
Merge commit '8eb57dc9d5ea13c12573e0759da0f7e79825af98'

* commit '8eb57dc9d5ea13c12573e0759da0f7e79825af98':
  buffersrc: Use the correct deallocation function

See: a6df9ce61520ad7583a90a20e82d857b8d4fb133
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/swscale: Get rid of the SWS_GAMMA_CORRECT flag
Michael Niedermayer [Thu, 23 Apr 2015 18:13:58 +0000 (20:13 +0200)]
swscale/swscale: Get rid of the SWS_GAMMA_CORRECT flag

This avoids using up a bit of the public flags

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd gamma encodign/decoding before/after scaling in libswscale
Pedro Arthur [Fri, 17 Apr 2015 20:08:42 +0000 (17:08 -0300)]
Add gamma encodign/decoding before/after scaling in libswscale

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: set timestamps for show_existing_frame return images.
Ronald S. Bultje [Wed, 22 Apr 2015 16:24:40 +0000 (12:24 -0400)]
vp9: set timestamps for show_existing_frame return images.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoalsdec: only adapt order for positive max_order
Andreas Cadhalpun [Wed, 22 Apr 2015 14:03:41 +0000 (16:03 +0200)]
alsdec: only adapt order for positive max_order

For max_order = 0 the clipping range is invalid. (amin = 2, amax = 1)

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: maintain lf_delta values if feature is turned off.
Ronald S. Bultje [Wed, 22 Apr 2015 15:51:02 +0000 (11:51 -0400)]
vp9: maintain lf_delta values if feature is turned off.

This is required if it's subsequently re-enabled with no value updates
(which means, use values that were previously set).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: add fate test for bilinear MC filter.
Ronald S. Bultje [Wed, 22 Apr 2015 15:51:01 +0000 (11:51 -0400)]
vp9: add fate test for bilinear MC filter.

Sample at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-06-bilinear.webm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agotests/tiny_psnr: do not ignore errors from run_psnr
Michael Niedermayer [Thu, 23 Apr 2015 02:25:40 +0000 (04:25 +0200)]
tests/tiny_psnr: do not ignore errors from run_psnr

failure to calculate psnr should not result in tiny_psnr returning success

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: Reset global flag on deinit
Vittorio Giovara [Wed, 22 Apr 2015 13:59:56 +0000 (14:59 +0100)]
lavf: Reset global flag on deinit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agonetwork: Do not leave context locked on error
Vittorio Giovara [Wed, 22 Apr 2015 13:59:55 +0000 (14:59 +0100)]
network: Do not leave context locked on error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add mp3 CBR seek test
wm4 [Wed, 22 Apr 2015 17:57:02 +0000 (19:57 +0200)]
fate: add mp3 CBR seek test

This tests the "old", now non-default seek mode, and this requires a
special extra argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: add fate size for resolution changes.
Ronald S. Bultje [Wed, 22 Apr 2015 00:54:52 +0000 (20:54 -0400)]
vp9: add fate size for resolution changes.

See sample:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-05-resize.ivf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: add support for resolution changes in inter frames.
Ronald S. Bultje [Wed, 22 Apr 2015 00:54:51 +0000 (20:54 -0400)]
vp9: add support for resolution changes in inter frames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: add cinepak encoder vsynth tests
James Almer [Wed, 22 Apr 2015 20:34:28 +0000 (17:34 -0300)]
fate: add cinepak encoder vsynth tests

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopostproc: Made QP, nonBQP, and pQPb arrays
Tucker DiNapoli [Wed, 22 Apr 2015 20:27:27 +0000 (16:27 -0400)]
postproc: Made QP, nonBQP, and pQPb arrays

Also pulled QP initialization out of inner loop, which removed some redundent code.

Added some dummy fields to PPContext to allow current code to work while
changing the rest of the postprocessing code to support the arrays.

I also increased alignment requirements for some fields in the PPContext struct to
support future avx2 code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agopostproc: Replaced inline asm for prefetching with prefetch functions
Tucker DiNapoli [Wed, 22 Apr 2015 20:27:26 +0000 (16:27 -0400)]
postproc: Replaced inline asm for prefetching with prefetch functions

Prefetching functions are defined in postprocess_template using the
RENAME macro so that prefetching is used when available. For x86
targets inline asm is used and the functions are non-empty only for
cpus where prefetching is available. For non x86 targets the gcc bultin
prefetch is used if it is available, otherwise no prefetching is done.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: add AVFMT_FLAG_FASTSEEK, use it for mp3
wm4 [Wed, 22 Apr 2015 10:24:41 +0000 (12:24 +0200)]
avformat: add AVFMT_FLAG_FASTSEEK, use it for mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agovp9: remove one optimization branch in iadst16 which causes overflows.
Ronald S. Bultje [Wed, 22 Apr 2015 18:53:01 +0000 (14:53 -0400)]
vp9: remove one optimization branch in iadst16 which causes overflows.

See sample vp90-2-14-resize-fp-tiles-16-8-4-2-1.webm from the vp9 test
vector set which reproduces the issue. This probably costs a few cycles,
but I don't think there's an easy way to workaround that.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agobink: check vst->index_entries before using it
Andreas Cadhalpun [Wed, 22 Apr 2015 15:08:51 +0000 (17:08 +0200)]
bink: check vst->index_entries before using it

This fixes a NULL pointer dereference if vst->duration is 0.

The problem was introduced in commit 0588acaf.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodshow: add capture device save and load
Mate Sebok [Wed, 22 Apr 2015 16:38:38 +0000 (18:38 +0200)]
dshow: add capture device save and load

Signed-off-by: Mate Sebok <smfinc.org@gmail.com>
Reviewed-by: Roger Pack <rogerdpack2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: gapless: remove useless tests
wm4 [Wed, 22 Apr 2015 10:24:40 +0000 (12:24 +0200)]
fate: gapless: remove useless tests

These could be kept, but they are not overly useful. The only thing they
had over the remaining mp3 gapless test was seeking, which was incorrect
in the toc test, and only by chance correct in the notoc test.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoapi-flac-test: Coding style
Ludmila Glinskih [Wed, 22 Apr 2015 15:09:15 +0000 (18:09 +0300)]
api-flac-test: Coding style

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompeg4videodec: only allow a positive length
Andreas Cadhalpun [Wed, 22 Apr 2015 14:32:42 +0000 (16:32 +0200)]
mpeg4videodec: only allow a positive length

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodss_sp: use lowercase codec name without whitespace
Andreas Cadhalpun [Wed, 22 Apr 2015 12:42:08 +0000 (14:42 +0200)]
dss_sp: use lowercase codec name without whitespace

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: make generic index mode the default
wm4 [Wed, 22 Apr 2015 10:24:39 +0000 (12:24 +0200)]
avformat/mp3dec: make generic index mode the default

It's the most useful mode, because it seeks accurately, and does not
break features like gapless audio.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: allow enabling generic seek mode
wm4 [Wed, 22 Apr 2015 10:24:38 +0000 (12:24 +0200)]
avformat/mp3dec: allow enabling generic seek mode

"-usetoc 2" now invokes the generic seek and indexing mode. This mode
skips data until the seek target is reached, and this is exact. It also
makes gapless audio actually work if a seek past the start of the file
is involved.

Change the fate-gapless-mp3 test to use the new mode, and move the old
one to fate-gapless-mp3-toc (since the test forces use of the Xing TOC).
The new mode has a different result for the seek - this result is
actually correct.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: use the common mechanism for skipping samples
wm4 [Wed, 22 Apr 2015 10:24:37 +0000 (12:24 +0200)]
avformat/mp3dec: use the common mechanism for skipping samples

The mp2 seek test results change. Whether to skip samples if the file
had no LAME gapless tags was inconsistent. When seeking to the start
of the file, 529 samples were skipped, but when playing from start,
nothing was skipped. This commit changes the behavior on seek to skip
nothing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat: add common mechanism for skipping samples at the start of file
wm4 [Wed, 22 Apr 2015 10:24:36 +0000 (12:24 +0200)]
avformat: add common mechanism for skipping samples at the start of file

This makes using the generic indexing code with mp3 easier at a later
point.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agohq_hqa: Validate get_vlc2 return value
Luca Barbato [Tue, 21 Apr 2015 12:42:21 +0000 (14:42 +0200)]
hq_hqa: Validate get_vlc2 return value

The `hq_ac_vlc.table` is incomplete, so unaccounted symbol return -1
as value.

5 years agoavcodec: Free the default avoptions on init failure
Luca Barbato [Tue, 21 Apr 2015 16:17:38 +0000 (18:17 +0200)]
avcodec: Free the default avoptions on init failure

5 years agoavcodec: Unref the dummy buffer on the fail path
Luca Barbato [Tue, 21 Apr 2015 12:26:36 +0000 (14:26 +0200)]
avcodec: Unref the dummy buffer on the fail path

5 years agobuffersrc: Use the correct deallocation function
Federico Tomassetti [Mon, 20 Apr 2015 19:12:05 +0000 (20:12 +0100)]
buffersrc: Use the correct deallocation function

This correction was suggested to me by Michael Niedermayer

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoalsdec: check sample pointer range in revert_channel_correlation
Andreas Cadhalpun [Tue, 21 Apr 2015 17:25:50 +0000 (19:25 +0200)]
alsdec: check sample pointer range in revert_channel_correlation

Also change the type of begin, end and smp to ptrdiff_t to make the
comparison well-defined.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowebmdashenc: parameter'ize minimumUpdatePeriod
Vignesh Venkatasubramanian [Wed, 22 Apr 2015 00:35:29 +0000 (17:35 -0700)]
webmdashenc: parameter'ize minimumUpdatePeriod

Some players do not support setting minimumUpdatePeriod to zero.
This patch adds a new parameter that will let the users set any
value to this field. Also updates the test and the documentation.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: use av_mod_uintp2() where useful
James Almer [Wed, 22 Apr 2015 01:28:21 +0000 (22:28 -0300)]
avcodec: use av_mod_uintp2() where useful

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years agowebmdashenc: Add minimumUpdatePeriod
Vignesh Venkatasubramanian [Tue, 21 Apr 2015 23:36:52 +0000 (16:36 -0700)]
webmdashenc: Add minimumUpdatePeriod

DASH spec requires the presence of either duration of the period
or the minimumUpdatePeriod element. This patch adds the
minimumUpdatePeriod element hardcoded with the value 0 as the
manifest will never be updated for WebM DASH Live streams. Also
updating the fate test reference file.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoaacpsy: correct calculation of minath in psy_3gpp_init
Andreas Cadhalpun [Tue, 21 Apr 2015 16:43:55 +0000 (18:43 +0200)]
aacpsy: correct calculation of minath in psy_3gpp_init

The minimum of the ath(x, ATH_ADD) function depends on ATH_ADD.
This patch uses the first order approximation to determine it.

For ATH_ADD = 4 this results in the value at 3407.06812 (-5.24241638)
not the one at 3410 (-5.24237967).

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Approved-by: Claudio Freire <klaussfreire@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov.c: Use %d to print an enum, not PRIu8
Chris Watkins [Tue, 21 Apr 2015 21:14:19 +0000 (14:14 -0700)]
avformat/mov.c: Use %d to print an enum, not PRIu8

Using the PRIu8 format specifier to print an enum value causes a
compiler warning, so use %d instead.

Fixes ticket #4467.

Signed-off-by: Chris Watkins <watk@chromium.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_qp: Fix use of uinitialized variable
Michael Niedermayer [Tue, 21 Apr 2015 20:42:46 +0000 (22:42 +0200)]
avfilter/vf_qp: Fix use of uinitialized variable

Found-by: <Timothy_Gu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'
Michael Niedermayer [Tue, 21 Apr 2015 18:20:58 +0000 (20:20 +0200)]
Merge commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386'

* commit '9b2c57bef5e2f3f61a5fd708ba7d5351f5b3f386':
  drawtext: Add an alpha option

Conflicts:
doc/filters.texi
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hq_hqa: remove superfluous log message
Paul B Mahol [Tue, 21 Apr 2015 13:19:32 +0000 (13:19 +0000)]
avcodec/hq_hqa: remove superfluous log message

Signed-off-by: Paul B Mahol <onemda@gmail.com>
5 years agoavfilter/vf_qp: fix cleanup on error
Michael Niedermayer [Tue, 21 Apr 2015 12:11:30 +0000 (14:11 +0200)]
avfilter/vf_qp: fix cleanup on error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodrawtext: Add an alpha option
Luca Barbato [Sat, 11 Apr 2015 17:04:25 +0000 (19:04 +0200)]
drawtext: Add an alpha option

And document both `draw` and `alpha`.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavformat/nsvdec: remove trace log from probe(), this is better done generically not...
Michael Niedermayer [Mon, 20 Apr 2015 15:30:48 +0000 (17:30 +0200)]
avformat/nsvdec: remove trace log from probe(), this is better done generically not per format

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mp3dec: Adjust returned timestamp in the CBR seeking case
Michael Niedermayer [Mon, 20 Apr 2015 18:42:38 +0000 (20:42 +0200)]
avformat/mp3dec: Adjust returned timestamp in the CBR seeking case

With this the returned timestamp should match the packet instead of
the requested timestamp, which may lay between  packets

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agowebmdashenc: Fix potential memory leak
Vignesh Venkatasubramanian [Mon, 20 Apr 2015 18:20:41 +0000 (11:20 -0700)]
webmdashenc: Fix potential memory leak

Fix potential memory leak in WebM DASH Muxer. This fixes coverity
scan CID 1295088.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use
Michael Niedermayer [Mon, 20 Apr 2015 20:22:31 +0000 (22:22 +0200)]
avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoSupport for VP9 high-color/high-bit-depth encoding
Deb Mukherjee [Thu, 26 Mar 2015 00:10:16 +0000 (17:10 -0700)]
Support for VP9 high-color/high-bit-depth encoding

Patch to support VP9 encoding with new profiles 1-3.
Profile 1 (8-bit 422/444) should work with default libvpx
configuration.
However you will need to configure libvpx with
--enable-vp9-highbitdepth before building and linking
with ffmpeg for profile 2 (10-/12-bit 420) and profile 3
(10-/12-bit 422/444) encoding.

You may use the appropriate profile option on the
command line:
-profile:v 1 for 422/444 8-bit encoding
-profile:v 2 for 420 10-/12- bit encoding
-profile:v 3 for 422/444 10-/12-bit encoding
If you do not use the -profile:v option, it will be deduced
from the source format.

Signed-off-by: James Zern <jzern@google.com>
5 years agoavformat/img2dec: do not rewind custom io buffers
Michael Niedermayer [Mon, 20 Apr 2015 21:59:53 +0000 (23:59 +0200)]
avformat/img2dec: do not rewind custom io buffers

Fixes double free with some applications

Fixes vlc ticket14121
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6'
Michael Niedermayer [Mon, 20 Apr 2015 21:30:33 +0000 (23:30 +0200)]
Merge commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6'

* commit 'eaa2d123f0a643664721593d248ece6bcd85f1e6':
  log: Print a full backtrace along with error messages under Valgrind

Conflicts:
libavutil/log.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'
Michael Niedermayer [Mon, 20 Apr 2015 21:20:17 +0000 (23:20 +0200)]
Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'

* commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431':
  hq_hqa: Fix reading hqa quantization matrix index

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1746dc382ddbf3f8a3f039815644f7eb9076110e'
Michael Niedermayer [Mon, 20 Apr 2015 21:13:12 +0000 (23:13 +0200)]
Merge commit '1746dc382ddbf3f8a3f039815644f7eb9076110e'

* commit '1746dc382ddbf3f8a3f039815644f7eb9076110e':
  hqxdsp.h: #include "stddef.h"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'
Michael Niedermayer [Mon, 20 Apr 2015 21:00:01 +0000 (23:00 +0200)]
Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'

* commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13':
  lavf: Fix variables constness in ff_iso8601_to_unix_time()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'
Michael Niedermayer [Mon, 20 Apr 2015 20:49:50 +0000 (22:49 +0200)]
Merge commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf'

* commit '86e1a35802df42f51337d3fed8d5d99d0898c8bf':
  h264_ps: Return meaningful error codes and address a memory leak

Conflicts:
libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '338ed3ed33c412c2828446c4e2a76949161fec6a'
Michael Niedermayer [Mon, 20 Apr 2015 20:43:31 +0000 (22:43 +0200)]
Merge commit '338ed3ed33c412c2828446c4e2a76949161fec6a'

* commit '338ed3ed33c412c2828446c4e2a76949161fec6a':
  ffv1: Pass correct pointers to av_free()

Conflicts:
libavcodec/ffv1.c

See: a3963cc8ec3b4e1780aadcbc0e5a7af625bae175
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b'
Michael Niedermayer [Mon, 20 Apr 2015 20:32:33 +0000 (22:32 +0200)]
Merge commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b'

* commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b':
  fate: Omit the results if the test passed

See: 1a562adb0101ac8372593b56ccd1bdb4ebb96b72
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd34039b171bebe37bf723a1b03e5651267099739'
Michael Niedermayer [Mon, 20 Apr 2015 20:24:15 +0000 (22:24 +0200)]
Merge commit 'd34039b171bebe37bf723a1b03e5651267099739'

* commit 'd34039b171bebe37bf723a1b03e5651267099739':
  rmenc: Drop the temporary buffer for ac3 byteswap

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '656e31ed8728b0c095d037dc9764fc8137c87200'
Michael Niedermayer [Mon, 20 Apr 2015 20:09:04 +0000 (22:09 +0200)]
Merge commit '656e31ed8728b0c095d037dc9764fc8137c87200'

* commit '656e31ed8728b0c095d037dc9764fc8137c87200':
  ogg: Forward errors further

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b18346817d57c96cc47811cf78b26653e96bd304'
Michael Niedermayer [Mon, 20 Apr 2015 19:52:18 +0000 (21:52 +0200)]
Merge commit 'b18346817d57c96cc47811cf78b26653e96bd304'

* commit 'b18346817d57c96cc47811cf78b26653e96bd304':
  flac: fix realloc loop with invalid flac files

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2cc3936599b6fc63143036659653d1be0624360f'
Michael Niedermayer [Mon, 20 Apr 2015 19:45:47 +0000 (21:45 +0200)]
Merge commit '2cc3936599b6fc63143036659653d1be0624360f'

* commit '2cc3936599b6fc63143036659653d1be0624360f':
  dashenc: Add a publishTime field in dynamic manifests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolog: Print a full backtrace along with error messages under Valgrind
Vittorio Giovara [Mon, 20 Apr 2015 13:44:32 +0000 (14:44 +0100)]
log: Print a full backtrace along with error messages under Valgrind

Useful to understand where and in what execution state a certain message
is generated. It is enabled only when optimizations are disabled, since
function names are not printed otherwise.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agohq_hqa: Fix reading hqa quantization matrix index
Vittorio Giovara [Mon, 20 Apr 2015 11:06:01 +0000 (12:06 +0100)]
hq_hqa: Fix reading hqa quantization matrix index

Value is stored as a byte.

5 years agohqxdsp.h: #include "stddef.h"
Vittorio Giovara [Mon, 20 Apr 2015 18:11:49 +0000 (19:11 +0100)]
hqxdsp.h: #include "stddef.h"

It is required by ptrdiff_t, fixes make checkheaders.

5 years agofate: gapless: fix mp3 tests
wm4 [Mon, 20 Apr 2015 17:36:52 +0000 (19:36 +0200)]
fate: gapless: fix mp3 tests

Seeking to a negative time did not have the desired effect of seeking to
the next valid position (the file start). On the other hand, just
"-ss 0" will normally seek to a position higher than 0, because it adds
the start time of the file. (The start time is not 0 because the gapless
code skips a few samples from the start.)

Fix this by using the "-seek_timestamp 1" option, which makes "-ss 0" do
what you'd expect it would do.

Also put the -ss option at the right place, before -i. This actually
makes it seek, instead of something completely else. The ".out-3" test
is no different in the -usetoc 0/1 cases, because the seeking is
inaccurate (in both cases).

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: add option not to offset seek position by start time
wm4 [Mon, 20 Apr 2015 17:36:51 +0000 (19:36 +0200)]
ffmpeg: add option not to offset seek position by start time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf: Fix variables constness in ff_iso8601_to_unix_time()
Vittorio Giovara [Mon, 20 Apr 2015 11:18:38 +0000 (12:18 +0100)]
lavf: Fix variables constness in ff_iso8601_to_unix_time()

warning: assigning to
      'char *' from 'const char *' discards qualifiers
      [-Wincompatible-pointer-types-discards-qualifiers]

5 years agoavformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS
Michael Niedermayer [Mon, 20 Apr 2015 15:41:22 +0000 (17:41 +0200)]
avformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mux: Place timestamp related trace av_logs under FF_FDEBUG_TS
Michael Niedermayer [Mon, 20 Apr 2015 15:29:20 +0000 (17:29 +0200)]
avformat/mux: Place timestamp related trace av_logs under FF_FDEBUG_TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mov: remove per packet timestamp print trace, theres generic code doing...
Michael Niedermayer [Mon, 20 Apr 2015 15:25:04 +0000 (17:25 +0200)]
avformat/mov: remove per packet timestamp print trace, theres generic code doing this in utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Place timestamp trace logs under FF_FDEBUG_TS
Michael Niedermayer [Mon, 20 Apr 2015 15:03:27 +0000 (17:03 +0200)]
avformat/utils: Place timestamp trace logs under FF_FDEBUG_TS

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: Provide context for av_log() where one is available
Michael Niedermayer [Mon, 20 Apr 2015 14:23:43 +0000 (16:23 +0200)]
avformat/utils: Provide context for av_log() where one is available

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/avidec: Do not call av_log() per byte, use ff_tlog()
Michael Niedermayer [Mon, 20 Apr 2015 14:20:49 +0000 (16:20 +0200)]
avformat/avidec: Do not call av_log() per byte, use ff_tlog()

This was av_dlog() previously and should not have been changed to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_ps: Return meaningful error codes and address a memory leak
Vittorio Giovara [Mon, 20 Apr 2015 12:01:59 +0000 (13:01 +0100)]
h264_ps: Return meaningful error codes and address a memory leak

Bug-Id: CID 1026763

5 years agoffv1: Pass correct pointers to av_free()
Diego Biurrun [Mon, 20 Apr 2015 11:58:45 +0000 (13:58 +0200)]
ffv1: Pass correct pointers to av_free()

Bug-Id: CID 1295124

5 years agoavcodec/parser: Remove duplicate header inlcude
Michael Niedermayer [Mon, 20 Apr 2015 12:58:09 +0000 (14:58 +0200)]
avcodec/parser: Remove duplicate header inlcude

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/mips/generic_macros_msa: volatile doesnt need __
Michael Niedermayer [Sat, 18 Apr 2015 10:16:28 +0000 (12:16 +0200)]
avutil/mips/generic_macros_msa: volatile doesnt need __

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/api-flac-test: clear callers context with close_*
Michael Niedermayer [Mon, 20 Apr 2015 12:24:38 +0000 (14:24 +0200)]
avcodec/api-flac-test: clear callers context with close_*

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec: Add FLAC API test
Ludmila Glinskih [Mon, 20 Apr 2015 00:03:08 +0000 (03:03 +0300)]
libavcodec: Add FLAC API test

Signed-off-by: Ludmila Glinskih <lglinskih@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/flacenc: also count wasted bits in subframe_count_exact()
Michael Niedermayer [Mon, 20 Apr 2015 12:11:15 +0000 (14:11 +0200)]
avcodec/flacenc: also count wasted bits in subframe_count_exact()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
Michael Niedermayer [Mon, 20 Apr 2015 10:46:29 +0000 (12:46 +0200)]
Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'

* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
  jack: Check memory allocation

Conflicts:
libavdevice/jack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agofate: Omit the results if the test passed
Timothy Gu [Fri, 10 Apr 2015 17:36:03 +0000 (10:36 -0700)]
fate: Omit the results if the test passed

The FATE server does not report this information anyway and omitting
it makes the successful run send much less data.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agormenc: Drop the temporary buffer for ac3 byteswap
Luca Barbato [Sat, 21 Mar 2015 14:38:37 +0000 (15:38 +0100)]
rmenc: Drop the temporary buffer for ac3 byteswap

Use direcly avio_w8().

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoogg: Forward errors further
Luca Barbato [Sat, 21 Mar 2015 15:34:39 +0000 (16:34 +0100)]
ogg: Forward errors further

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoflac: fix realloc loop with invalid flac files
Thomas Guillem [Thu, 16 Apr 2015 16:33:31 +0000 (18:33 +0200)]
flac: fix realloc loop with invalid flac files

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavfilter/buffersrc: Use correct, matching deallocation function
Michael Niedermayer [Mon, 20 Apr 2015 10:17:05 +0000 (12:17 +0200)]
avfilter/buffersrc: Use correct, matching deallocation function

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodashenc: Add a publishTime field in dynamic manifests
Martin Storsjö [Fri, 17 Apr 2015 21:01:02 +0000 (00:01 +0300)]
dashenc: Add a publishTime field in dynamic manifests

This field is mandatory in dynamic manifests.

Signed-off-by: Martin Storsjö <martin@martin.st>
5 years agoMerge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'
Michael Niedermayer [Mon, 20 Apr 2015 10:12:48 +0000 (12:12 +0200)]
Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'

* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
  buffersrc: Fix resource leak on error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'
Michael Niedermayer [Mon, 20 Apr 2015 10:12:03 +0000 (12:12 +0200)]
Merge commit '336d2f0979b43a39bd11a047d798b7990d8b07c6'

* commit '336d2f0979b43a39bd11a047d798b7990d8b07c6':
  avplay: Free frame and graph when memory allocation fails

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'eb31256f12bf0c85aded1612551ce9230356879e'
Michael Niedermayer [Mon, 20 Apr 2015 09:51:24 +0000 (11:51 +0200)]
Merge commit 'eb31256f12bf0c85aded1612551ce9230356879e'

* commit 'eb31256f12bf0c85aded1612551ce9230356879e':
  g2meet: Support G2M5 codec variant

Conflicts:
libavcodec/version.h

See: 4ba5420e4d3699b89c9f7f15928cd486f88e9562
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'
Michael Niedermayer [Mon, 20 Apr 2015 09:50:10 +0000 (11:50 +0200)]
Merge commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08'

* commit '88d1fb4e3f156d8fd5bb6cb3ba3a9ef1e6d6fb08':
  filtfmts: Avoid null pointer dereference

Conflicts:
libavfilter/filtfmts.c

See: 24326930d87dd7e851c1cc383bc0682d746ffaf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354'
Michael Niedermayer [Mon, 20 Apr 2015 09:39:28 +0000 (11:39 +0200)]
Merge commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354'

* commit 'a1d58e3b386cc0bfe16abd9ccee4eed182b7e354':
  avutil: remove pointless bmi1 define

See: a40cee03a3be131729e0c06e4825d14ac2076b03
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e'
Michael Niedermayer [Mon, 20 Apr 2015 09:38:01 +0000 (11:38 +0200)]
Merge commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e'

* commit '09bd7ddf2002562befa15a2a4d065b79ad14ed8e':
  aacdec: consistently use avctx for logging in decode_eld_specific_config

See: 5b75689b987e4c4dd4f34d5c8be389547e9cc701
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449'
Michael Niedermayer [Mon, 20 Apr 2015 09:29:17 +0000 (11:29 +0200)]
Merge commit '3d71b1f8f09fccea7158e868fb9bd81b81205449'

* commit '3d71b1f8f09fccea7158e868fb9bd81b81205449':
  mpegvideo_enc: Simplify picture allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'
Michael Niedermayer [Mon, 20 Apr 2015 09:26:27 +0000 (11:26 +0200)]
Merge commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0'

* commit '0251c9be5a9d79cb669e97086a82dc4d44a917b0':
  motion_est: Fix warning from zero_cmp() assignment

See: ea41e6d6373063c3a2a9bf48ce8e1c2e6340b694
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4d593896aaa81356def8993e8c52294bd8bb2797'
Michael Niedermayer [Mon, 20 Apr 2015 09:13:03 +0000 (11:13 +0200)]
Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797'

* commit '4d593896aaa81356def8993e8c52294bd8bb2797':
  vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr()

Conflicts:
libavcodec/vc1_pred.c

See: 6c5bd7d785ffb796b8cfbae677ab54755b26a22b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9286de045968ad456d4e752651eec22de5e89060'
Michael Niedermayer [Mon, 20 Apr 2015 09:03:32 +0000 (11:03 +0200)]
Merge commit '9286de045968ad456d4e752651eec22de5e89060'

* commit '9286de045968ad456d4e752651eec22de5e89060':
  mov: Double-check that alias path is not an absolute path

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'
Michael Niedermayer [Mon, 20 Apr 2015 03:51:36 +0000 (05:51 +0200)]
Merge commit '376589e5dd72aa2dd42500f456fca303fcdcad85'

* commit '376589e5dd72aa2dd42500f456fca303fcdcad85':
  mov: Read alternate absolute path in dref alis

Merged-by: Michael Niedermayer <michaelni@gmx.at>