Alexander Strasser
6693d57e99
lavf/avio: Remove unnecessary escaping of ' in string literals
...
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
8 years ago
Michael Niedermayer
8ebed703f1
avcodec/mpegaudiodec_template: Make l3_unscale() work with e=0
...
Fixes undefined behavior
Fixes: 830/clusterfuzz-testcase-6253175327686656
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
108b02e547
avcodec/tiff: Check for multiple geo key directories
...
Fixes memleak
Fixes: 826/clusterfuzz-testcase-5316921379520512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
0728d9a281
avcodec/pictordec: Fix runtime error: left shift of 805306368 by 2 places cannot be represented in type 'int'
...
Fixes: 823/clusterfuzz-testcase-6727060074528768
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Katherine Nagels
b2206475b4
doc/filters: Add colourspace values for colormatrix filter
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Kieran Kunhya <kierank@obe.tv>
8 years ago
Steven Liu
4e3cc4bdd8
avformat/flvenc: flx flvflags no_metadata bug
...
When use flvflags no_metadata , the FLV header will be cover by write tailer
This commit fix the bug
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
8 years ago
Steven Liu
d3ce067e76
avformat/hlsenc: fix ticket 6231
...
check if the hls_flags is byterange_mode and check if should close fd
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
8 years ago
Michael Niedermayer
7cebc5a9cc
avcodec/wavpack: Fix runtime error: shift exponent 32 is too large for 32-bit type 'int'
...
Fixes: 822/clusterfuzz-testcase-4873433189974016
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
acdacb108d
avcodec/targa: Skip hflip on blank images
...
Fixes: timeout with 810/clusterfuzz-testcase-5249282825256960
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
1467143a6e
avcodec/wavpack: Fix runtime error: shift exponent 137 is too large for 32-bit type 'int'
...
Fixes: 808/clusterfuzz-testcase-4715513349406720
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
a557ae8d52
avcodec/h264_direct: Fix runtime error: signed integer overflow: 2147483647 - -14133 cannot be represented in type 'int'
...
Fixes: 755/clusterfuzz-testcase-5369072516595712
See: [FFmpeg-devel] [PATCH 1/2] avcodec/h264_direct: Fix runtime error: signed integer overflow: 2147483647 - -14133 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Paul B Mahol
fbfbd97be2
avcodec/xpmdec: there are XPM files with dos line endings
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
62c8dc4642
avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ string
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Steven Liu
33e997d992
avformat/hlsenc: second_levels flags process function extract
...
the SECOND_LEVEL* flags process and name is too long
extract all of them output to funtions, make code clear
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
8 years ago
Michael Niedermayer
967feea5eb
avcodec/vp6: clear dimensions on failed resolution change in vp6_parse_header()
...
Fixes: 807/clusterfuzz-testcase-6470061042696192
Fixes null pointer dereference
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
a66c6e28b5
avcodec/rv34: Fix runtime error: signed integer overflow: 36880 * 66288 cannot be represented in type 'int'
...
Fixes: 768/clusterfuzz-testcase-4807444305805312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
a720b854b0
avcodec/mpeg12dec: Fix runtime error: left shift of negative value -1
...
Fixes: 764/clusterfuzz-testcase-6273034652483584
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Paul B Mahol
58f0bbc1ea
avcodec/xpmdec: avoid "magic" numbers in function hex_char_to_number()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
dd0090eb21
avcodec/xpmdec: fix colors values which are different for X11
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
2b790b1c9e
avcodec/xpmdec: do not allow number of colors to be higher than allocated
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
fbc1f323db
avcodec/xpmdec: rename yet another function
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
9d7e71a233
avcodec/xpmdec: rename convert to hex_char_to_number
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
7133ab435a
avcodec/xpmdec: improve comment for one function and also fix 2 identation issues
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Muhammad Faiz
6c7a0876fe
swresample/swresample: do not reset tsf on swr_alloc_set_opts
...
so tsf option in aresample will have effect
previously tsf/internal_sample_format had no effect
fate is updated
s32p previously used fltp internally
dblp previously used fltp/dblp internally
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
8 years ago
Jun Zhao
bf238a6a3c
vf_hwupload: Add missing return value check
...
Add missing return value checks to suppress build warning and
remove noop ff_formats_unref() calling.
Note: most filters using ff_formats_ref() didn't have a suitable
error handling, it's a potential memory leak issue.
Signed-off-by: Jun Zhao <jun.zhao@intel.com>
Signed-off-by: Mark Thompson <sw@jkqxz.net>
8 years ago
James Almer
ff17c76e92
tests/api-seek: fix memory leak on realloc() failure
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
8 years ago
James Almer
bdd07d7796
test/api-seek: clean up properly on failure
...
Also propagate better error values.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
8 years ago
James Almer
88deeb3eba
tests/api-seek: make the crc array uint32_t
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
8 years ago
Paul B Mahol
e73325b971
avcodec/xpmdec: skip everything before signature
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
01b069c1b8
avcodec/codec_desc: add mime type for X-BitMap
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
404d2b977f
avcodec/codec_desc: add mime type for X-PixMap
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paul B Mahol
eda78c8b7f
avcodec/xpmdec: make convert function more picky about its input
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Paras Chadha
5dab7b91ad
avcodec: add XPM decoder and demuxer
...
Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
8 years ago
Mark Thompson
b9acc7fbd9
Merge commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417'
...
* commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417':
lavfi: add a QSV deinterlacing filter
Minor fixup for lavfi differences.
Merged-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Mark Thompson
a7434ef195
Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'
...
* commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4':
qsvenc: print warnings from encode/init
Merged-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Mark Thompson
80fa5a0bcc
Merge commit '0956fd460681e8ccbdae19f135f0d3970bf95c2f'
...
* commit '0956fd460681e8ccbdae19f135f0d3970bf95c2f':
qsvenc: do not re-execute encoding on all positive status codes
Noop, see fb240a6276
.
Merged-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Mark Thompson
15887a410c
Merge commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49'
...
* commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49':
qsv: print more complete error messages
Merged-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Mark Thompson
723a542d6c
Merge commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b'
...
* commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b':
qsvenc: take only the allocated dimensions from the frames context
Merged-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Mark Thompson
562f386c77
Merge commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2'
...
* commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2':
qsvenc: add support for p010
Merged-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Anton Khirnov
807a3b30d2
lavfi: add a QSV scaling filter
...
This merges libav commit ac7bfd6967
,
which was previously skipped.
(cherry picked from commit ac7bfd6967
)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Mark Thompson
210dd7bbb2
Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'
...
* commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d':
qsv: handle the semi-packed formats in map_fourcc as well
Merged-by: Mark Thompson <sw@jkqxz.net>
8 years ago
Clément Bœsch
5e193daaa2
Merge commit 'f65285aba0df7d46298abe0c945dfee05cbc6028'
...
* commit 'f65285aba0df7d46298abe0c945dfee05cbc6028':
lavc: set sw_pix_fmt for hwaccel encoding
Merged-by: Clément Bœsch <u@pkh.me>
8 years ago
Clément Bœsch
8d2d817098
Merge commit 'd59641abfd25a1007bdf4723d952887b1e3619c6'
...
* commit 'd59641abfd25a1007bdf4723d952887b1e3619c6':
lavc: initialize AVCodecContext.sw_pix_fmt properly
Merged-by: Clément Bœsch <u@pkh.me>
8 years ago
Clément Bœsch
15f6e5f2a9
Merge commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b'
...
* commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b':
avconv_qsv: use the actual pixel format provided by lavc
This commit is a noop, see 03cef34aa6
Merged-by: Clément Bœsch <u@pkh.me>
8 years ago
Clément Bœsch
e514309a91
Merge commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0'
...
* commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0':
avconv_qsv: align the surface size to 32
This commit is a noop, see 03cef34aa6
Merged-by: Clément Bœsch <u@pkh.me>
8 years ago
Clément Bœsch
993a9a3d72
Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0'
...
* commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0':
avconv: stop using setpts for input framerate forced with -r
Merged-by: Clément Bœsch <u@pkh.me>
8 years ago
Paul B Mahol
807d5dcde9
avcodec/scpr: use correct linesize for prev frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
8 years ago
Michael Niedermayer
ce010655a6
avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + 6298923 cannot be represented in type 'int'
...
Fixes: 732/clusterfuzz-testcase-4872990070145024
See: [FFmpeg-devel] [PATCH 2/6] avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + 6298923 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
44e2105189
avcodec/amrwbdec: Fix runtime error: left shift of negative value -1
...
Fixes: 763/clusterfuzz-testcase-6007567320875008
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago
Michael Niedermayer
f4c2302ee2
avcodec/dca_xll: Fix runtime error: signed integer overflow: 1762028192 + 698372290 cannot be represented in type 'int'
...
Fixes: 762/clusterfuzz-testcase-5927683747741696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
8 years ago