Chris Watkins
0703c44692
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>
2015-04-21 23:48:07 +02:00
Michael Niedermayer
a79cbc0b8e
avfilter/vf_qp: Fix use of uinitialized variable
...
Found-by: <Timothy_Gu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-21 22:54:13 +02:00
Michael Niedermayer
122150168f
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>
2015-04-21 20:20:58 +02:00
Paul B Mahol
77e794908b
avcodec/hq_hqa: remove superfluous log message
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-04-21 13:19:32 +00:00
Michael Niedermayer
8f9a3817d5
avfilter/vf_qp: fix cleanup on error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-21 14:11:30 +02:00
Luca Barbato
9b2c57bef5
drawtext: Add an alpha option
...
And document both `draw` and `alpha`.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-21 11:13:30 +02:00
Michael Niedermayer
a924b83ccc
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>
2015-04-21 02:19:07 +02:00
Michael Niedermayer
ecf34e8fc2
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>
2015-04-21 01:31:28 +02:00
Vignesh Venkatasubramanian
30ba28fe8e
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>
2015-04-21 01:12:27 +02:00
Michael Niedermayer
ba631b7914
avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-21 00:58:11 +02:00
Deb Mukherjee
26a0bcb15b
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>
2015-04-20 15:24:13 -07:00
Michael Niedermayer
e6e8cc8ce9
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>
2015-04-20 23:59:53 +02:00
Michael Niedermayer
954b5e340e
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>
2015-04-20 23:30:33 +02:00
Michael Niedermayer
1a41415b2a
Merge commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431'
...
* commit 'bd5ad8b23d0f7d469ca30d03deca879993eb0431':
hq_hqa: Fix reading hqa quantization matrix index
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 23:20:36 +02:00
Michael Niedermayer
2f8f5027ad
Merge commit '1746dc382ddbf3f8a3f039815644f7eb9076110e'
...
* commit '1746dc382ddbf3f8a3f039815644f7eb9076110e':
hqxdsp.h: #include "stddef.h"
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 23:13:16 +02:00
Michael Niedermayer
5380c9afb9
Merge commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13'
...
* commit '98cab39798612dcaea4f9b6d1e7974bc60d84e13':
lavf: Fix variables constness in ff_iso8601_to_unix_time()
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 23:00:08 +02:00
Michael Niedermayer
037c9c25e6
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>
2015-04-20 22:49:50 +02:00
Michael Niedermayer
e6831c087e
Merge commit '338ed3ed33c412c2828446c4e2a76949161fec6a'
...
* commit '338ed3ed33c412c2828446c4e2a76949161fec6a':
ffv1: Pass correct pointers to av_free()
Conflicts:
libavcodec/ffv1.c
See: a3963cc8ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 22:46:46 +02:00
Michael Niedermayer
a570e81234
Merge commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b'
...
* commit '3b1e35d46dc910cef1d66f6964e6800cae5fc89b':
fate: Omit the results if the test passed
See: 1a562adb01
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 22:33:04 +02:00
Michael Niedermayer
d108820c2e
Merge commit 'd34039b171bebe37bf723a1b03e5651267099739'
...
* commit 'd34039b171bebe37bf723a1b03e5651267099739':
rmenc: Drop the temporary buffer for ac3 byteswap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 22:24:38 +02:00
Michael Niedermayer
3cd6f4546a
Merge commit '656e31ed8728b0c095d037dc9764fc8137c87200'
...
* commit '656e31ed8728b0c095d037dc9764fc8137c87200':
ogg: Forward errors further
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 22:12:08 +02:00
Michael Niedermayer
a5379d6e68
Merge commit 'b18346817d57c96cc47811cf78b26653e96bd304'
...
* commit 'b18346817d57c96cc47811cf78b26653e96bd304':
flac: fix realloc loop with invalid flac files
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 22:08:28 +02:00
Michael Niedermayer
5a14fca9aa
Merge commit '2cc3936599b6fc63143036659653d1be0624360f'
...
* commit '2cc3936599b6fc63143036659653d1be0624360f':
dashenc: Add a publishTime field in dynamic manifests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 21:45:56 +02:00
Vittorio Giovara
eaa2d123f0
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>
2015-04-20 19:20:57 +01:00
Vittorio Giovara
bd5ad8b23d
hq_hqa: Fix reading hqa quantization matrix index
...
Value is stored as a byte.
2015-04-20 19:20:22 +01:00
Vittorio Giovara
1746dc382d
hqxdsp.h: #include "stddef.h"
...
It is required by ptrdiff_t, fixes make checkheaders.
2015-04-20 19:19:23 +01:00
wm4
1e2e22ec61
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>
2015-04-20 19:50:58 +02:00
wm4
bac7084fbd
ffmpeg: add option not to offset seek position by start time
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 19:50:58 +02:00
Vittorio Giovara
98cab39798
lavf: Fix variables constness in ff_iso8601_to_unix_time()
...
warning: assigning to
'char *' from 'const char *' discards qualifiers
[-Wincompatible-pointer-types-discards-qualifiers]
2015-04-20 18:43:33 +01:00
Michael Niedermayer
57865a9747
avformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 17:41:22 +02:00
Michael Niedermayer
d4cf377947
avformat/mux: Place timestamp related trace av_logs under FF_FDEBUG_TS
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 17:36:36 +02:00
Michael Niedermayer
e48a0a6c3f
avformat/mov: remove per packet timestamp print trace, theres generic code doing this in utils.c
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 17:25:04 +02:00
Michael Niedermayer
84b95715fa
avformat/utils: Place timestamp trace logs under FF_FDEBUG_TS
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 17:03:27 +02:00
Michael Niedermayer
d02b3e9bdb
avformat/utils: Provide context for av_log() where one is available
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 16:24:47 +02:00
Michael Niedermayer
8a91ee7837
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>
2015-04-20 16:21:42 +02:00
Vittorio Giovara
86e1a35802
h264_ps: Return meaningful error codes and address a memory leak
...
Bug-Id: CID 1026763
2015-04-20 14:59:40 +01:00
Diego Biurrun
338ed3ed33
ffv1: Pass correct pointers to av_free()
...
Bug-Id: CID 1295124
2015-04-20 14:59:40 +01:00
Michael Niedermayer
1ca8052640
avcodec/parser: Remove duplicate header inlcude
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 14:58:09 +02:00
Michael Niedermayer
42d6d249b0
avutil/mips/generic_macros_msa: volatile doesnt need __
...
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 14:39:50 +02:00
Michael Niedermayer
2a00ef5d81
avcodec/api-flac-test: clear callers context with close_*
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 14:36:41 +02:00
Ludmila Glinskih
be70c79af2
libavcodec: Add FLAC API test
...
Signed-off-by: Ludmila Glinskih <lglinskih@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 14:36:41 +02:00
Michael Niedermayer
09b0f227ce
avcodec/flacenc: also count wasted bits in subframe_count_exact()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 14:36:36 +02:00
Michael Niedermayer
1c667626bb
Merge commit '386e2755aab73ae7075f78d92786cb5c5419597a'
...
* commit '386e2755aab73ae7075f78d92786cb5c5419597a':
jack: Check memory allocation
Conflicts:
libavdevice/jack.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:46:29 +02:00
Timothy Gu
3b1e35d46d
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>
2015-04-20 12:41:34 +02:00
Luca Barbato
d34039b171
rmenc: Drop the temporary buffer for ac3 byteswap
...
Use direcly avio_w8().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-20 12:41:33 +02:00
Luca Barbato
656e31ed87
ogg: Forward errors further
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-20 12:41:33 +02:00
Thomas Guillem
b18346817d
flac: fix realloc loop with invalid flac files
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-04-20 12:41:33 +02:00
Michael Niedermayer
a6df9ce615
avfilter/buffersrc: Use correct, matching deallocation function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:33:20 +02:00
Martin Storsjö
2cc3936599
dashenc: Add a publishTime field in dynamic manifests
...
This field is mandatory in dynamic manifests.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-20 13:16:45 +03:00
Michael Niedermayer
0c9e78caf4
Merge commit '617814b4a717b38add5ccb8dd200dbb655f98f09'
...
* commit '617814b4a717b38add5ccb8dd200dbb655f98f09':
buffersrc: Fix resource leak on error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 12:15:16 +02:00