Michael Niedermayer
afebf470ca
avutil/tests/dict: Check return of av_dict_parse_string()
...
Fixes: CID1396402
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer
77a3c288bd
avformat/mov: Init ref_sc / ref_st to NULL
...
This is more robust in case some change or corner case causes them to be
dereferenced before being set
Fixes CID1396274, CID1396275
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer
bd8201566d
avformat/libopenmpt: Check for avio_size() failure
...
Fixes CID1396850
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer
477ba8f939
avfilter/af_chorus & aecho: Handle NULL return from av_strtok()
...
Fixes CID1396260
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Michael Niedermayer
fe46d92c15
avcodec/clearvideo: Do not lose the return code of decode_mb()
...
Fixes CID1401671
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 23:35:18 +02:00
Clément Bœsch
2a68d3b1a5
Merge commit ' 88f0cf8cd3'
...
* commit '88f0cf8cd3 ':
avplay: Correct function pointer assignments in options array
This commit is a noop, see a9a1bc56ab
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:23:40 +02:00
Clément Bœsch
aac40dd615
Merge commit ' 943533d64c'
...
* commit '943533d64c ':
avconv: Correct function pointer assignments in options array
This commit is a noop, see 4c96985af1
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:22:52 +02:00
Clément Bœsch
9813df1189
Merge commit ' 43de8b328b'
...
* commit '43de8b328b ':
lzf: update pointer p after realloc
This commit is a noop, see bb6a7b6f75
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:22:07 +02:00
Clément Bœsch
62e46fac26
Merge commit ' ab839054e6'
...
* commit 'ab839054e6 ':
swscale: Add GRAY12
This commit is a noop, see 19be5fb728
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:21:31 +02:00
Clément Bœsch
719f1a923f
Merge commit ' 7471352f19'
...
* commit '7471352f19 ':
pixfmt: Add GRAY12
This commit is a noop, see 638b216d4f
Merged-by: Clément Bœsch <u@pkh.me>
2017-03-30 23:18:56 +02:00
Mark Thompson
ff821fdfce
Merge commit ' 4ab61cd983'
...
* commit '4ab61cd983 ':
qsv{enc,dec}: extend the internal frame allocator
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 22:07:57 +01:00
Mark Thompson
c0f2a8eac1
Merge commit ' 00aeedd841'
...
* commit '00aeedd841 ':
qsv{dec,enc}: use a struct as a memory id with internal memory allocator
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 22:06:03 +01:00
Mark Thompson
2f18e452f8
Merge commit ' 404e51478e'
...
* commit '404e51478e ':
qsv{dec,enc}: always use an internal mfxFrameSurface1
Minor fixups for differences in the QSV encoder because of a53cc.
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 22:00:03 +01:00
Mark Thompson
e3f9c5826a
Merge commit ' e8bbacbf52'
...
* commit 'e8bbacbf52 ':
hwcontext_qsv: support frame mapping
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:54:46 +01:00
Michael Niedermayer
855305fac2
avfilter/vf_minterpolate: Use dx and dy
...
Fixes CID1396283 and CID1396284
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Michael Niedermayer
4798237f01
avfilter/deshake_opencl: Remove redundant return
...
Fixes: CID1396846
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Michael Niedermayer
4064f3f0df
avfilter/af_sofalizer: Fix bad shift
...
Fixes CID1396835
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:46:31 +02:00
Mark Thompson
546524056d
Merge commit ' 8ea15afbf2'
...
* commit '8ea15afbf2 ':
hwcontext_qsv: transfer data through the child context when VPP fails
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:18:23 +01:00
Mark Thompson
7cb082ac2f
Merge commit ' b91ce48600'
...
* commit 'b91ce48600 ':
hwcontext_qsv: do not fail when download/upload VPP session creation fails
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:16:58 +01:00
Mark Thompson
59b1942aae
Merge commit ' b115a35ea6'
...
* commit 'b115a35ea6 ':
hwcontext_qsv: add support for the P8 format
Merged-by: Mark Thompson <sw@jkqxz.net>
2017-03-30 21:16:09 +01:00
Michael Niedermayer
e976e68fc5
avcodec/atrac3: Check init_get_bits8() for failure
...
This is more for correctness than actually fixing a missing error path
Fixes CID1399967
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 22:13:38 +02:00
Gyan Doshi
2104e3383f
avfilter/avf_abitscope: Correct range for framerate
...
Signed-off-by: Gyan Doshi <gyandoshi@gmail.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com> (via IRC)
2017-03-30 10:29:14 -08:00
Michael Niedermayer
59b8c2a4e6
doc/examples/encode_audio: Favor a sample rate close to 44khz instead of the maximum sample rate
...
This is an example, people will copy and use this. The maximum supported is quite
unreasonable as a default choice
Reviewed-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:34:06 +02:00
Michael Niedermayer
004f27f0fb
ffmpeg: Fix avframe memleak
...
Fixes CID1401674
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:34:06 +02:00
Michael Niedermayer
8779ec91b2
avformat/mux: Check return code of av_packet_split_side_data()
...
Fixes CID1403225
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 16:30:14 +02:00
Matthieu Bouron
03372d0a90
doc/examples/filtering_audio: switch to new decoding API
2017-03-30 16:20:13 +02:00
Matthieu Bouron
afd257b43f
doc/examples/filtering_video: switch to new decoding API
2017-03-30 16:20:07 +02:00
Clément Bœsch
b22c4d822b
doc/codecs: add jedec-p22
2017-03-30 13:59:15 +02:00
Leo Izen
7449169081
avformat/nut: Add HEVC and Opus support
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-30 13:26:04 +02:00
Hendrik Leppkes
14764b93e2
Merge commit ' 10065d9324'
...
* commit '10065d9324 ':
hwcontext_dxva2: add support for the P8 format
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2017-03-30 11:37:39 +02:00
Hendrik Leppkes
9ca5d2de5d
Merge commit ' 9109737654'
...
* commit '9109737654 ':
hwcontext_dxva2: frame mapping support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2017-03-30 11:33:51 +02:00
Clément Bœsch
46998d037f
Merge commit ' fabfbfe571'
...
* commit 'fabfbfe571 ':
dxva2: fix surface selection when compiled with both d3d11va and dxva2
This commit is a noop, see 153b36fc62
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:13:08 +02:00
Clément Bœsch
03f22c288a
Merge commit ' db0b3dccb3'
...
* commit 'db0b3dccb3 ':
libx265: Add option to force IDR frames
This commit is a noop, see 8a8902f221
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:10:11 +02:00
Clément Bœsch
80f91c8d5a
Merge commit ' 3cba09e522'
...
* commit '3cba09e522 ':
x86: Drop stray semicolons after function definitions
This commit is a noop, they are already fixed in FFmpeg.
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:07:09 +02:00
Clément Bœsch
8524b0162f
Merge commit ' d1ef1b9eaa'
...
* commit 'd1ef1b9eaa ':
configure: Silence lld-link when getting the version number
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 11:04:12 +02:00
Clément Bœsch
aa7976fd15
Merge commit ' 392caa65df'
...
* commit '392caa65df ':
arm: vp9mc: Insert a literal pool at the middle of the file
This commit is a noop, see 68caef9d48
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:59:10 +02:00
Clément Bœsch
71c22fb7ae
Merge commit ' 8ad9f9d675'
...
* commit '8ad9f9d675 ':
hwcontext_vaapi: Frame mapping support
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:55:32 +02:00
Clément Bœsch
6234fd2fa0
Merge commit ' 124e26971e'
...
* commit '124e26971e ':
lavfi: Hardware map filter
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:51:32 +02:00
Clément Bœsch
4cda23f1f1
Merge commit ' d06aa24ba5'
...
* commit 'd06aa24ba5 ':
hwcontext: Hardware frame mapping
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:36:37 +02:00
Clément Bœsch
03f5e80bdb
Merge commit ' 67351924fa'
...
* commit '67351924fa ':
Drop unreachable break and return statements
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:26:29 +02:00
Clément Bœsch
f291a9a1ad
Merge commit ' 99434f4df8'
...
* commit '99434f4df8 ':
float_dsp: Have implementation match function pointer prototype
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:23:25 +02:00
Clément Bœsch
77248d1218
Merge commit ' 6354957a95'
...
* commit '6354957a95 ':
dnxhdenc: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:21:41 +02:00
Clément Bœsch
7b89015715
Merge commit ' c778eb15b8'
...
* commit 'c778eb15b8 ':
pixblockdsp: Have function pointer prototype match implementation
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:14:21 +02:00
Clément Bœsch
c223784ea7
Merge commit ' 99ddeddc7f'
...
* commit '99ddeddc7f ':
ituh263dec: Have function signature match across declaration and definition
This commit is a noop, see 2d2b363c65
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:12:43 +02:00
Clément Bœsch
4f96c11ed7
Merge commit ' 67c65e461c'
...
* commit '67c65e461c ':
vf_hwupload_cuda: Fix build error
This commit is a noop, see 78e871ebbc
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:07:00 +02:00
Clément Bœsch
a5745897e4
Merge commit ' 13fcdfb976'
...
* commit '13fcdfb976 ':
svq3: Drop unused function dctcoef_get()
This commit is a noop, see 1e298e7724
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:06:01 +02:00
Clément Bœsch
b76dd6a678
Merge commit ' ee59f05408'
...
* commit 'ee59f05408 ':
intrax8: Have function signature match across declaration and definition
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 10:03:59 +02:00
Clément Bœsch
a48c0c41c4
Merge commit ' 1a469a5e42'
...
* commit '1a469a5e42 ':
options_table: Remove a now unnecessary include of config.h
This commit is a noop, see 76f43cbe26
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 09:58:09 +02:00
Clément Bœsch
d4bb093ad3
Merge commit ' ffbd1d2b00'
...
* commit 'ffbd1d2b00 ':
arm: vp9: Add NEON optimizations of VP9 MC functions
This commit is a noop, see 68caef9d48
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 09:47:50 +02:00
Clément Bœsch
4503d678cb
Merge commit ' 2e55e26b40'
...
* commit '2e55e26b40 ':
vp9: Flip the order of arguments in MC functions
This commit is a noop, it was made to match our prototypes.
Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-30 09:35:37 +02:00