James Almer
a97ea53ad9
configure: bump year
...
Happy new year!
(cherry picked from commit 3209d7b393 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 01:23:01 +01:00
Michael Niedermayer
05ed562862
Update for 3.2.13
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 01:17:07 +01:00
Michael Niedermayer
3389d479ac
avcodec/diracdec: Check component quant
...
Fixes: Timeout
Fixes: 10708/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5730140957442048
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 28c96c2ce2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 01:17:07 +01:00
Michael Niedermayer
53319cbe97
avcodec/tests/rangecoder: initialize array to avoid valgrind warning
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c15972f0af )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
f4a9455e03
avcodec/h264_slice: Fix integer overflow in implicit_weight_table()
...
Fixes: signed integer overflow: 2 * 2132811760 cannot be represented in type 'int'
Fixes: 11156/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6237685933408256
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 77e56d74f9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
9f92a1d020
avcodec/exr: set layer_match in all branches
...
Otherwise it is left to the value from the previous iteration
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 433d2ae435 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
aae57535ca
avcodec/4xm: Fix returned error codes
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 07607a1db8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
a27b49579d
avcodec/mjpegbdec: Fix some misplaced {} and spaces
...
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 11a8d2ccab )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
David Bryant
0eaff670a7
avformat/wvdec: detect and error out on WavPack DSD files
...
Not currently supported.
(cherry picked from commit db109373d8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
gxw
0f9cb4e726
avcodec/mips: Fix failed case: hevc-conformance-AMP_A_Samsung_* when enable msa
...
The AV_INPUT_BUFFER_PADDING_SIZE has been increased to 64, but the value is still 32
in function ff_hevc_sao_edge_filter_8_msa. So, use AV_INPUT_BUFFER_PADDING_SIZE directly.
Also, use MAX_PB_SIZE directly instead of 64. Fate tests passed.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f652c7a45c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
6e5238d55f
avcodec/fic: Fail on invalid slice size/off
...
Fixes: Timeout
Fixes: 11486/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FIC_fuzzer-5677133863583744
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 30a7a81cdc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
5a82f570a4
postproc/postprocess_template: remove FF_REG_sp from clobber list
...
Future gcc may no longer support this
Tested-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c1cbeb87db )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
bcf1557736
postproc/postprocess_template: Avoid using %4 for the threshold compare
...
This avoids problems if %4 is the stack pointer
the constraints do not allow %4 to be the stack pointer but gcc 9 may
no longer support specifying such constraints
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4325527e1c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
a48c69a04e
avcodec/rpza: Check that there is enough data for all the blocks
...
Fixes: Timeout
Fixes: 11547/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RPZA_fuzzer-5678435842654208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e63517e00a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
b96292c6d3
avcodec/rpza: Move frame allocation to a later point
...
This will allow performing some fast checks before the slow allocation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8a708aa99c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
bcc42f1923
avcodec/avcodec: Document the data type for AV_PKT_DATA_MPEGTS_STREAM_ID
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 68e011e410 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
d9010b1d8f
avformat/mpegts: Fix side data type for stream id
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ab1319d82f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
72536017a7
avcodec/mjpegdec: Fix indention of ljpeg_decode_yuv_scan()
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ea30ac1e40 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
chcunningham
490a5253ca
lavf/id3v2: fail read_apic on EOF reading mimetype
...
avio_read may return EOF, leaving the mimetype array unitialized. fail
early when this occurs to avoid using the array in an unitialized state.
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ee1e39a576 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
9925adcd68
avformat/nutenc: Document trailer index assert better
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3a95b73abc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
chcunningham
418f13261f
lavf/mov: ensure only one tkhd per trak
...
Chromium fuzzing produced a whacky file with extra tkhds. This caused
an AVStream that was already in use to be corrupted by assigning it a
new id, which blows up later in mov_read_trun because the
MOVFragmentStreamInfo.index_entry now points OOB.
Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c9f7b6f7a9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
3c2207b10f
avcodec/msvideo1: Check for too small dimensions
...
Such low resolution would result in empty output as a minimum of 4x4 is needed
We could also check for multiple of 4 dimensions but that is not needed
Fixes: Timeout
Fixes: 11191/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSVIDEO1_fuzzer-5739529588178944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 953bd58861 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
4ff4fd4179
avcodec/wmv2dec: Skip I frame if its smaller than 1/8 of the minimal size
...
Frames that small are not valid and of limited use for error concealment, while
being very computationally intensive to process.
Fixes: Timeout
Fixes: 11168/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5733782032744448
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d6f4341522 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
aa5190d54a
avcodec/msmpeg4dec: Skip frame if its smaller than 1/8 of the minimal size
...
Frames that small are not valid and of limited use for error concealment, while
being very computationally intensive to process.
Fixes: Timeout
Fixes: 11318/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSMPEG4V1_fuzzer-5710884555456512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 09ec182864 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
f3400e731a
avcodec/truemotion2rt: Fix rounding in input size check
...
Fixes: Timeout
Fixes: 11332/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2RT_fuzzer-5678456612847616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7f22a4ebc9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2019-01-15 00:57:27 +01:00
Michael Niedermayer
dfa3a5ac63
avcodec/truemotion2: fix integer overflows in tm2_low_chroma()
...
Fixes: 11295/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-4888953459572736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2ae39d7956 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-24 22:15:15 +01:00
Michael Niedermayer
de1d2ea6b2
avcodec/pngdec: Check compression method
...
method 0 (inflate/deflate) is the only specified in the specification and the only supported
Fixes: Timeout
Fixes: 10976/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_PNG_fuzzer-5729372588736512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1f99674ddd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
0612e6a0d7
avcodec/shorten: Fix integer overflow with offset
...
Fixes: signed integer overflow: -1625810908 - 582229060 cannot be represented in type 'int'
Fixes: 10977/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5732602018267136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2f888771cd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
d10266a96f
avcodec/cavsdec: Propagate error codes inside decode_mb_i()
...
Fixes: Timeout
Fixes: 10702/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CAVS_fuzzer-5669940938407936
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c1cee05656 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
875a5d055b
avcodec/mpegaudio_parser: Consume more than 0 bytes in case of the unsupported mp3adu case
...
Fixes: Timeout
Fixes: 10966/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADU_fuzzer-5348695024336896
Fixes: 10969/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5691669402877952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit df91af140c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
c2af767c3e
avutil/integer: Fix integer overflow in av_mul_i()
...
Found-by: fate
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3cc3cb663b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
e6f8f6a7ee
avcodec/msrle: Check that the input is large enough to contain a end of picture code
...
Fixes: Timeout
Fixes: 10625/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSRLE_fuzzer-5659651283091456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 203ccb8746 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
353ef58a82
avcodec/jpeg2000dec: Fix off by 1 error in JPEG2000_PGOD_CPRL handling
...
Fixes: assertion failure
Fixes: 10785/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5672160496975872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 305e523105 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
1effc4baa1
avcodec/mpeg4videodec: Fix typo in sprite delta check
...
Fixes: Integer overflow
Fixes: 10890/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5636062181851136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b737317a88 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
72268fbdc3
avcodec/h264_cavlc: Check mb_skip_run
...
Fixes: 10300/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-6292205497483264
Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f72b9904fe )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
f266eca585
avcodec/ra144: Fix integer overflow in add_wav()
...
Fixes: signed integer overflow: -2144033225 + -5208934 cannot be represented in type 'int'
Fixes: 10633/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RA_144_fuzzer-5679133791617024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c6282141cb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
77d35ab734
avformat/utils: Never store negative values in last_IP_duration
...
Fixes: integer overflow compute_pkt_fields()
Fixes: compute_pkt_usan
Reported-by: Thomas Guilbert <tguilbert@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 079d1a7175 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
9181ecd2e6
avformat/utils: Fix integer overflow in discontinuity check
...
Fixes: signed integer overflow: 7738135736989908991 - -7954308516317364223 cannot be represented in type 'long'
Fixes: find_stream_info_usan
Reported-by: Thomas Guilbert <tguilbert@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4e19cfcfa3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
72babd45c8
avcodec/unary: Improve get_unary() docs
...
Found-by: kierank
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ad89e203bf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
7bcc4d7ea7
avcodec/dvdsubdec: Sanity check len in decode_rle()
...
Fixes: Timeout
Fixes: 9778/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVDSUB_fuzzer-5186007132536832
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e7b023e1db )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
64bccfd11d
avcodec/mpeg4videodec: Fix undefined shift in get_amv()
...
Fixes: runtime error: shift exponent -1 is negative
Fixes: 9938/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5653783529914368
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c88afa44c4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
2baee6dd1b
avcodec/zmbv: Check that the decompressed data size is correct
...
This checks the value exactly for intra frames and checks it against a
minimum for inter frames as they can be variable.
Fixes: Timeout
Fixes: 10182/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZMBV_fuzzer-6245951174344704
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e33b28cc79 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
5fe92631fc
avcodec/zmbv: Update decomp_len in raw frames
...
decomp_len is used in raw frames, so it should not be left at the value from
whatever was decoded previously (which may be any other frame)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3d201b83cd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
3b20cd4f65
avcodec/shorten: Fix bitstream end check in read_header()
...
Fixes: Timeout
Fixes: 9961/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5687856176562176
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 28b80c2d52 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
9f0e0a4cf2
avcodec/dvdsubdec: Avoid branch in decode_run_8bit()
...
Speed improvment 35.5 sec -> 34.7sec
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 71bf033050 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
59c463f4cc
avcodec/h264_refs: Document last if() in ff_h264_execute_ref_pic_marking()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 697984b9db )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Michael Niedermayer
a90f6d3e90
avcodec/ra144: Fix undefined integer overflow in add_wav()
...
Fixes: signed integer overflow: -26884 * 91439 cannot be represented in type 'int'
Fixes: 9687/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RA_144_fuzzer-4995588121690112
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 93a203662f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:35:03 +01:00
Dale Curtis
a72d42b80f
avformat/mov: Error on too large stsd entry counts.
...
Entries are always at least 8 bytes per the parsing code, so if we
see an impossible entry count avoid massive allocations. This is
similar to an existing check in mov_read_stsc().
Since ff_mov_read_stsd_entries() does eof checks, an alternative
approach could be to clamp the entry count to atom.size / 8.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 320b631a99 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
368e7a0994
avcodec/hq_hqa: Check remaining input bits in hqa_decode_mb()
...
Fixes: Timeout
Fixes: 9634/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HQ_HQA_fuzzer-6267852259590144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c9222b972d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
2df51ffcb7
avcodec/vb: Check for end of bytestream before reading blocktype
...
Fixes: Timeout
Fixes: 9601/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_VB_fuzzer-4550228702134272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1cbac9ce20 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
c6b7060137
avcodec/snowdec: Fix integer overflow with motion vector residual
...
Fixes: signed integer overflow: -19818 + -2147483648 cannot be represented in type 'int'
Fixes: 9545/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-4928769537081344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit acba153a14 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
5d7bab77de
avformat/nsvdec: Do not parse multiple NSVf
...
The specification states "NSV files may contain a single file header. "
Fixes: out of array access
Fixes: nsv-asan-002f473f726a0dcbd3bd53e422c4fc40b3cf3421
Found-by: Paul Ch <paulcher@icloud.com >
Tested-by: Paul Ch <paulcher@icloud.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 78d4b6bd43 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
949995b225
avformat/mlvdec: read_string() received unsigned size, make the argument unsigned
...
Fixes: infinite loop
Fixes: mlv-timeout-e3b8cab9835edecad6823baa057e029671329d04
Found-by: Paul Ch <paulcher@icloud.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1e71cb2c8e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
b535e8936b
avformat/rmdec: Fix EOF check in the stream loop in ivr_read_header()
...
Fixes: long running loop
Fixes: ivr-timeout-42468cb797f52f025fb329394702f5d4d64322d6
Found-by: Paul Ch <paulcher@icloud.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c2eec1762d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
c71fe632b7
avcodec/shorten: Fix signed 32bit overflow in shift in shorten_decode_frame()
...
Fixes: runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
Fixes: 9480/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-6647324284551168 -rss_limit_mb=2000
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9b604e96a5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
eba99acdf2
avcodec/shorten: Fix integer overflow in residual/LPC combination
...
Fixes: signed integer overflow: -540538872 + -2012739576 cannot be represented in type 'int'
Fixes: 9255/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5758630052757504
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit db7e9082e1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
f20a35a13e
avcodec/shorten: Check verbatim length
...
Fixes: Timeout
Fixes: 9252/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5780720709533696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7007dabec0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
1a9810dde0
avcodec/mpegaudio_parser: Initialize poutbuf*
...
Possibly fixes: null pointer dereference
Possibly fixes: 9352/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5146068961460224
Fixes: Heap-use-after-free
Fixes: 9453/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP3ADUFLOAT_fuzzer-5137954375729152
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0f4c3b0b8e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
cc9263c2e1
avcodec/aacpsdsp_template: Fix integer overflow in ps_stereo_interpolate_c()
...
Fixes: signed integer overflow: -1813244069 + -1407981383 cannot be represented in type 'int'
Fixes: 8823/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5643295618236416
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 47db5763e2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
1b28323822
avformat/flvenc: Check audio packet size
...
Fixes: Assertion failure
Fixes: assert_flvenc.c:941_1.swf
Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6b67d7f059 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
09800cbc01
avcodec/qtrle: Check remaining bytestream in qtrle_decode_XYbpp()
...
Fixes: Timeout
Fixes: 9213/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QTRLE_fuzzer-5649753332252672
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7dd836a3f9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
7a7a6bf8e2
avcodec/diracdec: Check bytes count in else branch in decode_lowdelay() too
...
Fixes: signed integer overflow: 8 * 340018243 cannot be represented in type 'int'
Fixes: 9441/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5194665207791616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bed125b710 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
ec7cf0c74f
avcodec/diracdec: Check slice numbers for overflows in relation to picture dimensions
...
Fixes: signed integer overflow: 88 * 33685506 cannot be represented in type 'int'
Fixes: 9433/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5725943535501312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f457c0ad7f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:44 +01:00
Michael Niedermayer
6ebb8f5ab5
avcodec/diracdec: Change frame_number to 64bit as its a 32bit from the bitstream and we also have a -1 special case
...
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
Fixes: 9291/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-6324345860259840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 462d1be6de )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:43 +01:00
Michael Niedermayer
33ee198cdb
avcodec/dirac_dwt_template: Fix several integer overflows in horizontal_compose_daub97i()
...
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
Fixes: 8926/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-6047609228623872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 69cac9e130 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:43 +01:00
Michael Niedermayer
8ed1874dab
avcodec/diracdec: Prevent integer overflow in intermediate in global_mv()
...
Fixes: signed integer overflow: -393471 * 5460 cannot be represented in type 'int'
Fixes: 8890/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-6299775379963904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5129040646 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:43 +01:00
Michael Niedermayer
430405eb0b
swresample/swresample: Fix input channel count in resample_first computation
...
Found-by: Marcin Gorzel <gorzel@google.com >
Reviewed-by: Marcin Gorzel <gorzel@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bce4da85e8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:43 +01:00
Michael Niedermayer
b130cdb923
avutil/pixfmt: Document chroma plane size for odd resolutions
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit be0b77e6e8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-11-18 02:20:43 +01:00
Michael Niedermayer
67149cb2f6
avformat/asfdec_o: Check size_bmp more fully
...
Fixes: integer overflow and out of array access
Fixes: asfo-crash-46080c4341572a7137a162331af77f6ded45cbd7
Found-by: Paul Ch <paulcher@icloud.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2b46ebdbff )
Signed-off-by: James Almer <jamrial@gmail.com >
2018-08-08 01:37:20 -03:00
Alexandra Hájková
32e8eed1ae
asfdec: Account for different Format Data sizes
...
Some muxers may use the BMP_HEADER Format Data size instead
of the ASF-specific one.
Signed-off-by: Diego Biurrun <diego@biurrun.de >
(cherry picked from commit 42f27d1b8e )
Signed-off-by: James Almer <jamrial@gmail.com >
2018-08-08 01:33:27 -03:00
James Almer
ecafc4af95
avcodec/bitstream_filters: check the input argument of av_bsf_get_by_name() for NULL
...
Fixes crashes like "ffmpeg -h bsf" caused by passing NULL to strcmp()
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 3258cc6507 )
2018-07-28 22:46:00 -03:00
Michael Niedermayer
a911f234e2
Update for 3.2.12
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-18 23:04:10 +02:00
Michael Niedermayer
94fda4f9ec
avcodec/dvdsub_parser: Allocate input padding
...
Fixes: out of array read
Fixes: 9350/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DVDSUB_fuzzer-5746777750765568
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cd86b5cfe2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-18 16:57:03 +02:00
Michael Niedermayer
ffc9ef8f4c
avcodec/dvdsub_parser: Init output buf/size
...
No testcase
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9e6c843776 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-18 16:57:03 +02:00
Michael Niedermayer
fe73afd730
avcodec/dirac_dwt_template: Fix signedness regression in interleave()
...
Found-by: <jdarnley>
Tested-by: James Darnley <james.darnley@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 181435a4de )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-18 16:57:03 +02:00
Michael Niedermayer
2c0e98a0b4
avformat/movenc: Write version 2 of audio atom if channels is not known
...
The version 1 needs the channel count and would divide by 0
Fixes: division by 0
Fixes: fpe_movenc.c_1108_1.ogg
Fixes: fpe_movenc.c_1108_2.ogg
Fixes: fpe_movenc.c_1108_3.wav
Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fa19fbcf71 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-18 16:57:03 +02:00
Rahul Chaudhry
a1d4de0559
swresample/arm: rename labels to fix xcode build error
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e84212b78e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-18 16:57:03 +02:00
James Almer
e870255e4e
avformat/utils: fix mixed declarations and code
...
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 31de45d20b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-18 16:57:03 +02:00
Simon Thelen
c773ce32e1
avcodec/imgconvert: fix possible null pointer dereference
...
regression since 354b26a394
(cherry picked from commit 8c2c97403b )
2018-07-15 16:45:45 +03:00
Michael Niedermayer
97321ae360
Update for 3.2.11
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 21:07:45 +02:00
Michael Niedermayer
3571bec56e
avformat/movenc: Check input sample count
...
Fixes: division by 0
Fixes: fpe_movenc.c_199_1.wav
Fixes: fpe_movenc.c_199_2.wav
Fixes: fpe_movenc.c_199_3.wav
Fixes: fpe_movenc.c_199_4.wav
Fixes: fpe_movenc.c_199_5.wav
Fixes: fpe_movenc.c_199_6.wav
Fixes: fpe_movenc.c_199_7.wav
Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3a2d21bc5f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
64993b613b
avcodec/mjpegdec: Check for odd progressive RGB
...
Fixes: out of array access
Fixes: 9225/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5684770334834688
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ee1e3ca5eb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
92972f1916
avformat/movenc: Check that frame_types other than EAC3_FRAME_TYPE_INDEPENDENT have a supported substream id
...
Fixes: out of array access
Fixes: ffmpeg_bof_1.avi
Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ed22dc2221 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
f65d6ff9ab
avformat/mms: Add missing chunksize check
...
Fixes: out of array read
Fixes: mms-crash-01b6c5d85f9d9f40f4e879896103e9f5b222816a
Found-by: Paul Ch <paulcher@icloud.com >
1st hunk by Paul Ch <paulcher@icloud.com >
Tested-by: Paul Ch <paulcher@icloud.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cced03dd66 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
e82a06d2be
avformat/pva: Check for EOF before retrying in read_part_of_packet()
...
Fixes: Infinite loop
Fixes: pva-4b1835dbc2027bf3c567005dcc78e85199240d06
Found-by: Paul Ch <paulcher@icloud.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9807d3976b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
4a42353c7a
avformat/rmdec: Do not pass mime type in rm_read_multi() to ff_rm_read_mdpr_codecdata()
...
Fixes: use after free()
Fixes: rmdec-crash-ffe85b4cab1597d1cfea6955705e53f1f5c8a362
Found-by: Paul Ch <paulcher@icloud.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a7e032a277 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
2b8c152327
avcodec/indeo4: Check for end of bitstream in decode_mb_info()
...
Fixes: Timeout
Fixes: 8776/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-5361788798369792
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 267ba2aa96 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
c7dca18226
avcodec/shorten: Fix undefined addition in shorten_decode_frame()
...
Fixes: signed integer overflow: 1139785606 + 1454196085 cannot be represented in type 'int'
Fixes: 8937/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-6202943597445120
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3b10bb8772 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
e1d4289596
avcodec/shorten: Fix undefined integer overflow
...
Fixes: signed integer overflow: 8454144 * 256 cannot be represented in type 'int'
Fixes: 8788/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5728205041303552
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 70832333bb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
c68a8137ce
avcodec/jpeg2000dec: Fixes invalid shifts in jpeg2000_decode_packets_po_iteration()
...
Fixes: shift exponent 47 is too large for 32-bit type 'int'
Fixes: 9163/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5661750182543360
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 652d7c6348 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
636081c982
avcodec/jpeg2000dec: Check that there are enough bytes for all tiles
...
Fixes: OOM
Fixes: 8781/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5810709081358336
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0898a3d990 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
e6d3fd942f
avformat/movenc: Do not pass AVCodecParameters in avpriv_request_sample
...
Fixes: out of array read
Fixes: ffmpeg_crash_8.avi
Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 95556e27e2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
09e4f84365
avcodec/escape124: Fix spelling errors in comment
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f59c4e4391 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
4bb368e6d9
avcodec/ra144: Fix integer overflow in ff_eval_refl()
...
Fixes: signed integer overflow: -4096 * -524288 cannot be represented in type 'int'
Fixes: 8650/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RA_144_fuzzer-5734816036159488
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b31189881a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
28a0f69987
avcodec/cscd: Check output buffer size for lzo.
...
Fixes: Timeout
Fixes: 8665/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CSCD_fuzzer-5768442610188288
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
(cherry picked from commit 78167b498f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
dac23ef23c
avcodec/escape124: Check buf_size against num_superblocks
...
Fixes: Timeout
Fixes: 8722/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ESCAPE124_fuzzer-4843268402577408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6677c98626 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
2a30376e50
avcodec/h264_parser: Reduce needed history for parsing mb index
...
This fixes a bug/regression with very small packets
Fixes: output_file
Regression since: 0782fb6bcb
Reported-by: Thierry Foucu <tfoucu@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d25c945247 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
be9424966f
avcodec/mjpegdec: Check for end of bitstream in ljpeg_decode_rgb_scan()
...
Fixes: Timeout
Fixes: 8648/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEG_fuzzer-5108395525799936
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 540e8c2d64 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
5cf8268b03
avcodec/aacdec_fixed: Fix undefined integer overflow in apply_independent_coupling_fixed()
...
Fixes: signed integer overflow: 1195517 * 2048 cannot be represented in type 'int'
Fixes: 8636/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-4695836326887424
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8bd514d934 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
836a9d62d1
avcodec/dirac_dwt_template: Fix undefined behavior in interleave()
...
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
Fixes: 8697/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5197148130902016
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 575d8ca026 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
75c0be5b93
avutil/common: Fix undefined behavior in av_clip_uintp2_c()
...
Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Fixes: 8521/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5639024952737792
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit aa41d322be )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
699e09f0de
fftools/ffmpeg: Fallback to duration if sample rate is unavailable
...
Regression since: af1761f7
Fixes: Division by 0
Fixes: ffmpeg_crash_1
Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 16d8b13b3b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
39723d1ccb
avformat/mov: Only set pkt->duration to non negative values
...
Reviewed-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8176799f31 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
35cd7417f9
avcodec/h264_ps: Move MAX_LOG2_MAX_FRAME_NUM to header so it can be used in h264_sei
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b796c5ae92 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
7281cf7195
avcodec/h264_mc_template: Only prefetch motion if the list is used.
...
Fixes: index 59 out of bounds for type 'H264Ref [48]'
Fixes: 8232/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-5703295145345024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8b55591757 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
d18d83f5a1
avcodec/xwddec: Use ff_set_dimensions()
...
Fixes: OOM
Fixes: 8178/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XWD_fuzzer-4844793342459904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c2852e4e00 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
e1eebcbe3b
avcodec/wavpack: Fix overflow in adding tail
...
Fixes: signed integer overflow: 2146907204 + 26846088 cannot be represented in type 'int'
Fixes: 8105/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-6233036682166272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d13379fb79 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
eba50bdadc
avcodec/shorten: Fix multiple integer overflows
...
Fixes: signed integer overflow: 3 * 1006632960 cannot be represented in type 'int'
Fixes: 8278/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5692857166856192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f2abd36b38 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
72aac791f1
avcodec/shorten: Fix undefined shift in fix_bitshift()
...
Fixes: left shift of negative value -9
Fixes: 8571/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5715966875926528
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 606c714823 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
e2207d5c46
avcodec/shorten: Fix a negative left shift in shorten_decode_frame()
...
Fixes: left shift of negative value -9057
Fixes: 8527/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5666853924896768
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a711efe922 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
9b1cbcdafb
avcodec/shorten: Sanity check nmeans
...
Fixes: OOM
Fixes: 8195/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5179785826271232
The reference software appears to use longs for 32bits and it uses int for nmeans
hinting that the intended maximum size was not 32bit.
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d91a0b503d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
60021049be
avcodec/shorten: Check non COMM chunk len before skip in decode_aiff_header()
...
Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
Fixes: 8024/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SHORTEN_fuzzer-5109204648984576
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 424a81df10 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
e520692e14
avcodec/mjpegdec: Fix integer overflow in ljpeg_decode_rgb_scan()
...
Fixes: signed integer overflow: 32768 + 2147450880 cannot be represented in type 'int'
Fixes: 7885/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THP_fuzzer-5298834394578944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 936f4a2c2e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
89c2b51579
avcodec/truemotion2: Fix overflow in tm2_apply_deltas()
...
Fixes: signed integer overflow: 1077952576 + 1077952576 cannot be represented in type 'int'
Fixes: 7712/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5056281753681920
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 79c6047c36 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:47 +02:00
Michael Niedermayer
5acbb27cbd
avcodec/opus_silk: Change silk_lsf2lpc() slightly toward silk/NLSF2A.c
...
Fixes: runtime error: signed integer overflow: -1440457022 - 785819492 cannot be represented in type 'int'
Fixes: 7700/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_OPUS_fuzzer-6595838684954624
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e7dda51150 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
008288c2c4
avcodec/amrwbdec: Fix division by 0 in find_hb_gain()
...
This restructures the code slightly toward D_UTIL_dec_synthesis()
Fixes: 7420/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AMRWB_fuzzer-6577305112543232
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit dce80a4b47 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
6a11c4955c
avformat/mov: replace a value error by clipping into valid range in mov_read_stsc()
...
Fixes : #7165
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fe84f70819 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
d1f924319e
avformat/mov: Break out early if chunk_count is 0 in mov_build_index()
...
Without this some operations might overflow (undefined behavior)
even though the index adding loop would never execute
No testcase known
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 56e76bd057 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
6ad66ddce3
avcodec/fic: Avoid some magic numbers related to cursors
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c6a11714c4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
9797767ff7
avcodec/g2meet: ask for sample with overflowing RGB
...
Suggested-by: Tomas Härdin <tjoppen@acc.umu.se >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ab834b8f36 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
ec1aca8500
avcodec/aacdec_fixed: use 64bit to avoid overflow in rounding in apply_dependent_coupling_fixed()
...
Fixes: signed integer overflow: -2141499320 + -14469590 cannot be represented in type 'int'
Fixes: 7351/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-6351214791884800
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 90475db97e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
32aa3e55b1
oavcodec/aacpsdsp_template: Use unsigned for hs0X to prevent undefined behavior
...
Fixes: signed integer overflow: 1073741842 + 1784008138 cannot be represented in type 'int'
Fixes: 6792/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5677589835284480
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 62cb6fadf3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
55e4a40e96
avcodec/g723_1dec: Clip bits2 in both directions
...
Fixes: shift exponent 33 is too large for 32-bit type 'int'
Fixes: 6743/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G723_1_fuzzer-5823772687859712
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 53f241218d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
d6f8960812
avcodec/mpeg4videoenc: Use 64 bit for times in mpeg4_encode_gop_header()
...
Fixes truncation
Fixes Assertion n <= 31 && value < (1U << n) failed at libavcodec/put_bits.h:169
Fixes: ffmpeg_crash_2.avi
Found-by: Thuan Pham <thuanpv@comp.nus.edu.sg >, Marcel Böhme, Andrew Santosa and Alexandru RazvanCaciulescu with AFLSmart
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e1182fac1a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
99b4524bfb
avcodec/mlpdec: Only change noise_type if the related fields are valid
...
Fixes: inconsistency
Fixes:runtime error: index 8 out of bounds for type 'int32_t [8]'
Fixes: 6686/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-5191383498358784
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 63c4a4b0d6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
2a9f93d8b0
indeo4: Decode all or nothing of a band header.
...
This avoids inconsistent value combinations.
Alternatively it would be possible to add more checks and careful use of
temporary variables, but my try of this quickly seemed to become
a rather large change.
The disadvantage of this, is that the struct is copied back and forth.
Fixes: index 6 out of bounds for type 'const uint16_t [5][16]'
Fixes: 6557/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-4787296550256640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 10c8521265 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
c3ff11cc08
avformat/mov: Only fail for STCO/STSC contradictions if both exist
...
Fixes regression with playback of GF9720Repeal20the20Eighth20with20Helen20Linehan.m4a
See: crbug 822666
Found-by: "Mattias Wadman <mattias.wadman@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2c2d689c56 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
3a97317e8b
avcodec/dirac_dwt: Fix integer overflow in COMPOSE_DD97iH0 / COMPOSE_DD137iL0
...
Fixes: negation of -2147483648 cannot be represented in type 'int32_t' (aka 'int');
Fixes: 6500/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-4523620274536448
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cb944fc7f1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
837c42535b
avcodec/fic: Check available input space for cursor
...
Fixes: out of array read
Fixes: 6546/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FIC_fuzzer-6317064647081984
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cb2f7ea96b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
8878f43cf5
avcodec/g2meet: Check RGB upper limit
...
Fixes: runtime error: left shift of 1876744317 by 16 places cannot be represented in type 'int'
Fixes: 6799/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5115274731716608
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4dd2c8b9ea )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
45b45ce240
avcodec/jpeg2000dec: Fix undefined shift in the jpeg2000_decode_packets_po_iteration() CPRL case
...
Fixes: shift exponent 47 is too large for 32-bit type 'int'
Fixes: 7955/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6016721977606144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 652ba72ed3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
6d3b48f285
avcodec/jpeg2000dec: Skip init for component in CPRL if nothing is to be done
...
Fixes: assertion failure
Fixes: 7949/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-4819602782552064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a96c131eb5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
b06c67cbf3
avcodec/g2meet: Change order of operations to avoid undefined behavior
...
Fixes: signed integer overflow: 65280 * 196032 cannot be represented in type 'int'
Fixes: 7279/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5977332473921536
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0a47451458 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
c21933835b
avcodec/flac_parser: Fix infinite loop
...
Fixes: crbug/827204
Reported-by: Frank Liberato <liberato@google.com >
Reviewed-by: Frank Liberato <liberato@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 15a2e35e9e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
6ea3a2a276
avcodec/wavpack: Fix integer overflow in DEC_MED() / INC_MED()
...
Fixes: runtime error: signed integer overflow: 2147483637 + 128 cannot be represented in type 'int'
Fixes: 6701/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVPACK_fuzzer-5358324934508544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6e95d80e6f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
1411eddce6
avcodec/error_resilience: Fix integer overflow in filter181()
...
Fixes: runtime error: signed integer overflow: 197710 * 10923 cannot be represented in type 'int'
Fixes: 7010/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-5667127596941312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1c97035e3b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
95156bdb59
avcodec/h263dec: Check slice_ret in mspeg4 slice loop
...
Fixes infinite loop
Fixes: 6858/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_MSMPEG4V3_fuzzer-4681563766784000
Fixes: 6890/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_WMV1_fuzzer-4756103142309888
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit de841fbea7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
2901299610
avcodec/elsdec: Fix memleaks
...
Fixes: 6798/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G2M_fuzzer-5135899701542912
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0bd0401336 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
83e870beb8
avcodec/vc1_block: simplify ac_val computation
...
also fixes: runtime error: index 1456 out of bounds for type 'int16_t [16]'
Found-by: durandal_1707
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d06b01fc2d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
1e4bd765ac
avcodec/ffv1enc: Check that the crc + version combination is supported
...
The crc flag is only stored since version 3 thus before this crcs do not
work. We increase the version as needed same as we do with pix_fmts
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d9706f79c1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Stephan Holljes
fbb65e77b6
lavf/http.c: Free allocated client URLContext in case of error.
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7b6b8c9265 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
05f4488bd7
avcodec/dsicinvideo: Fail if there is only a small fraction of the data available that comprises a full frame
...
Fixes: Timeout
Fixes: 6306/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DSICINVIDEO_fuzzer-5079253549842432
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5549488bbf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
8b89c007e8
avcodec/dsicinvideo: Propagate errors from cin_decode_rle()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 942217b153 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
e77fe2b7c4
avcodec/dfa: Check dimension against maximum
...
The headers from where the dimensions are read in actual files
are limited to 16bit per component.
Fixes: Timeout
Fixes: 6305/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DFA_fuzzer-4824270749302784
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9d5a4fcfbb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
6b382d4d86
avcodec/cinepak: Skip empty frames
...
Speeds up decoding from 3 to 0.1 seconds for 6302/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5626371985375232
Fixes: Timeout
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9033920bec )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
b01b57f7e0
avcodec/cinepak: move some checks prior to frame allocation
...
Speeds up decoding from 8 to 3 seconds for 6302/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5626371985375232
Fixes: Timeout
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2324ef1ff3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Rahul Chaudhry
e7f1090a54
swresample/arm: remove unintentional relocation.
...
Branch to global symbol results in reference to PLT, and when compiling
for THUMB-2 - in a R_ARM_THM_JUMP19 relocation. Some linkers don't
support this relocation (ld.gold), while others can end up truncating
the relocation to fit (ld.bfd).
Convert this branch through PLT into a direct branch that the assembler
can resolve locally.
See https://github.com/android-ndk/ndk/issues/337 for background.
The current workaround is to disable neon during gstreamer build,
which is not optimal and can be reverted after this patch:
41556c4157
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b22db4f465 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
5a2a40fa78
doc/APIchanges: Fix typos in hashes
...
Thanks-to: Moritz Barsnick <barsnick@gmx.net > for finding the correct ones
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ec8a5262b0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
bb6146ca6d
avformat/utils: Check cur_dts in update_initial_timestamps() more
...
Fixes: runtime error: signed integer overflow: 18133149658382192 - -9223090561878065151 cannot be represented in type 'long long'
Fixes: crbug 831552
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 37d46dc21d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
1fbd13ebe5
avcodec/utils: Enforce minimum width also for VP5/6
...
Fixes: out of array access
Fixes: poc_0411
Found-by: GwanYeong Kim <gy741.kim@gmail.com >
Tested-by: GwanYeong Kim <gy741.kim@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 544324827e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
c512be126b
avcodec/truemotion2: Propagate out of bounds error from GET_TOK()
...
Fixes: Timeout
Fixes: 6389/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5695918121680896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f6304af234 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
8d40798dd0
avformat/utils: Fix integer overflow in end time calculation in update_stream_timings()
...
Fixes: crbug 829153
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c48ceff786 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
8b0de157d2
avcodec/mjpegdec: Check input buffer size.
...
Fixes: Timeout
Fixes: 6381/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5665032743419904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8d381b57fd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
b545cc000d
avformat/mov: Fix extradata memleak
...
Fixes: crbug 822705
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0a8133119c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Matt Wolenetz
c2e611fef6
lavc/libopusdec: Allow avcodec_open2 to call .close
...
If there is a decoder initialization failure detected in avcodec_open2
after .init is called, allow graceful decoder .close to prevent leaking
libopus decoder allocations.
BUG=828526
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e43e97f0e0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
173fdd9b65
avcodec/movtextdec: Check style_start/end
...
Limits based on 3GPP TS 26.245 V14.0.0
Fixes: Timeout
Fixes: 6377/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MOVTEXT_fuzzer-5175929115508736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Philip Langdale <philipl@overt.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 249aca8f98 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
626da21af8
avcodec/aacsbr_fixed: Fix integer overflow in sbr_hf_assemble()
...
Fixes: runtime error: signed integer overflow: 2052929346 + 204817098 cannot be represented in type 'int'
This was missed in b1bef755f6
Fixes: 5275/clusterfuzz-testcase-minimized-5367635958038528
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c837918f50 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
c66c4da55a
libavcodec/rv34: error out earlier on missing references
...
Fixes visual corruption on seeking
Fixes: downloadTest_clip_24M.rmvb
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6cd81d68c5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Hendrik Schreiber
da51b8be0b
swresample/swresample: Fix for seg fault in swr_convert_internal() -> sum2_float during dithering.
...
Removed +len1 in call to s->mix_2_1_f() as I found no logical explanation for it. After removal, problem was gone.
Signed-off-by: Hendrik Schreiber <hs@tagtraum.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 647fd4b829 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
f14c3cfbc3
avcodec/aacdec_fixed: Fix integer overflow in apply_independent_coupling_fixed()
...
I was not able to reproduce this, this fix is based on just the fuzzer log.
Fixes: 4959/clusterfuzz-testcase-minimized-6035350934781952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 197a4e8fee )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
050d779a1f
avcodec/cscd: Error out when LZ* decompression fails
...
Fixes: Timeout
Fixes: 6304/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CSCD_fuzzer-5754772461191168
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d52be5d4e9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
heimdallr
e0888e5758
avcodec/imgconvert: Fix loss mask bug in avcodec_find_best_pix_fmt_of_list()
...
example:
AVPixelFormat pixFmts[] = { AV_PIX_FMT_RGB24, AV_PIX_FMT_RGBA };
int loss = 0;
AVPixelFormat best = avcodec_find_best_pix_fmt_of_list(pixFmts, AV_PIX_FMT_BGRA, 1, &loss);
best is AV_PIX_FMT_RGB24. But AV_PIX_FMT_RGBA is better.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 354b26a394 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
7050970d06
avcodec/utvideodec: Set pro flag based on fourcc
...
This avoids mixing 8bit variants with pro and 10bit with non pro mode.
Fixes: out of array read
Fixes: poc_03_30.avi
Found-by: GwanYeong Kim <gy741.kim@gmail.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 47b7c68ae5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
3d329dc8c3
avcodec/wmalosslessdec: Fix null pointer dereference in decode_frame()
...
Fixes: 2018_03_23_poc.wav
Found-by: GwanYeong Kim <gy741.kim@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ea15915b2d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
a3ffdf43e6
avcodec/tableprint_vlc: Fix build failure with --enable-hardcoded-tables
...
Found-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5c75438b89 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:46 +02:00
Michael Niedermayer
ea209bee9c
avformat/mov: Move +1 in check to avoid hypothetical overflow in add_ctts_entry()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit eb60b9d3aa )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
e054e9fb20
avcodec/get_bits: Make sure the input bitstream with padding can be addressed
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e529fe7633 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
0288fa9319
avformat/mov: Check STSC and remove invalid entries
...
Fixes assertion failure
Fixes: crbug 822547, crbug 822666 and crbug 823009
Affects: aark15sd_9A62E2FA.mp4
Found-by: ClusterFuzz
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9e67447a4f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
f6a55b0490
avcodec/nuv: rtjpeg with dimensions less than 16 would result in no decoded pixels thus reject it
...
Fixes: Timeout
Fixes: 6297/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-4882404863901696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 939440ad1a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
da1b72ae35
avcodec/nuv: Check for minimum input size for uncomprssed and rtjpeg
...
Fixes: Timeout
Fixes: 6297/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_NUV_fuzzer-4882404863901696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8ee3265dbe )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
7a5630b56a
avcodec/wmalosslessdec: Reset num_saved_bits on error path
...
Fixes: NULL pointer dereference
Fixes: poc-201803.wav
Found-by: GwanYeong Kim <gy741.kim@gmail.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 64c9ce0abc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
791c0940f5
avformat/mov: Fix integer overflows related to sample_duration
...
Fixes: runtime error: signed integer overflow: -9166684017437101870 + -2495066639299164439 cannot be represented in type
Fixes: Chromium bug 791349
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2f37082827 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
2583022266
avformat/oggparsedaala: Do not adjust AV_NOPTS_VALUE
...
Fixes: potential signed integer overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f655ddfb47 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
723f154ae0
avformat/oggparseogm: Check lb against psize
...
No testcase, this was found during code review
Found-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3e7c847aaf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
bdb68741ba
avformat/oggparseogm: Fix undefined shift in ogm_packet()
...
Fixes: shift exponent 48 is too large for 32-bit type 'int'
Fixes: Chromium bug 786793
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 010b7b30b7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
35194c4e02
avformat/avidec: Fix integer overflow in cum_len check
...
Fixes: signed integer overflow: 3775922176 * 4278190080 cannot be represented in type 'long'
Fixes: Chromium bug 791237
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 06e092e781 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
adfbb5112d
avformat/oggparsetheora: Do not adjust AV_NOPTS_VALUE
...
Fixes: Chromium bug 795653
Fixes: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long'
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 02ecda4aba )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
d3e6b38a41
avformat/utils: Fix integer overflow of fps_first/last_dts
...
Fixes: runtime error: signed integer overflow: 7738135736989908991 - -7898362169240453118 cannot be represented in type 'long'
Fixes: Chromium bug 796778
Reported-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1b1362e408 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
4c1d58f937
libavformat/oggparsevorbis: Fix memleak on multiple headers
...
Fixes: Chromium bug 800123
Reported-by: Matt Wolenetz <wolenetz@google.com >
Reviewed-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3934aa495d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
7fafcad8d5
avcodec/truemotion2rt: Check input buffer size
...
Fixes: Timeout
Fixes: 6250/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2RT_fuzzer-5479814011027456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8b5c29b6c2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
b827d3a352
avcodec/exr: fix invalid shift in unpack_14()
...
Fixes: 6154/clusterfuzz-testcase-minimized-5762231061970944
Fixes: runtime error: shift exponent 63 is too large for 32-bit type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 49062a9017 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
2dc487bcb0
avcodec/bintext: sanity check dimensions
...
Fixes: Timeout
Fixes: 6277/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_XBIN_fuzzer-6047202288861184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 090c0abff9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
9c05935764
avcodec/utvideodec: Check subsample factors
...
Fixes: Out of array read
Fixes: heap_poc
Found-by: GwanYeong Kim <gy741.kim@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7414d0bda7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
36268aa896
avcodec/smc: Check input packet size
...
Fixes: Timeout
Fixes: 6261/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMC_fuzzer-5811309653262336
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0293663483 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
72f06b3a2c
avcodec/cavsdec: Check alpha/beta offset
...
Fixes: Integer overflow
Fixes: 6183/clusterfuzz-testcase-minimized-6269224436629504
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ae2eb04648 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
51f64667fc
avcodec/diracdec: Fix integer overflow in mv computation
...
Fixes: signed integer overflow: -2072 + -2147483646 cannot be represented in type 'int'
Fixes: 6097/clusterfuzz-testcase-minimized-5034145253163008
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 47e65ad63b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
2c08bd58d8
avcodec/h264_parse: Clear invalid chroma weights in ff_h264_pred_weight_table()
...
Fixes: 6037/clusterfuzz-testcase-minimized-5030249784934400
Fixes: signed integer overflow: 256 * 16992036 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 85c85fffff )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
145e40c0d0
avcodec/aacdec_templat: Fix integer overflow in apply_ltp()
...
Fixes: signed integer overflow: -1625276744 + -1041893960 cannot be represented in type 'int'
Fixes: 5948/clusterfuzz-testcase-minimized-5791479856365568
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 33fe17bdc8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
8360920972
avcodec/jpeg2000dwt: Fix integer overflows in sr_1d53()
...
Fixes: 5918/clusterfuzz-testcase-minimized-5120505435652096
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 793347a545 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
736ef72bff
avcodec/diracdec: Use int64 in global mv to prevent overflow
...
Fixes: runtime error: signed integer overflow: 361 * -6295541 cannot be represented in type 'int'
Fixes: 5911/clusterfuzz-testcase-minimized-6450382197751808
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cbcbefdc3b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
1c905c02d0
avcodec/dxtory: Remove code that corrupts dimensions
...
Fixes: Timeout
Fixes: 5796/clusterfuzz-testcase-minimized-5206729085157376
Does someone have a valid sample that triggers this path ?
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3748746a4d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
db617c9520
avcodec/dirac_dwt_template: Fix Integer overflow in horizontal_compose_dd137i()
...
Fixes: 5894/clusterfuzz-testcase-minimized-5315325420634112
Fixes: runtime error: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 647fa49495 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:45:45 +02:00
Michael Niedermayer
ca85929440
avcodec/vp8: Check for bitstream end before vp7_fade_frame()
...
Fixes: Timeout
Fixes: 5653/clusterfuzz-testcase-5497680018014208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit de675648ce )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Michael Niedermayer
a7bd00eab4
avcodec/exr: Check remaining bits in last get code loop
...
Fixes: runtime error: shift exponent -7 is negative
Fixes: 3902/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-6081926122176512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit dd8351b118 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Michael Niedermayer
fc9dcfb9f2
avutil/common: Fix integer overflow in av_clip_uint8_c() and av_clip_uint16_c()
...
Fixes: 5567/clusterfuzz-testcase-minimized-5769966247739392
Fixes: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ab6f571ef7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Michael Niedermayer
ed04cbf62b
avcodec/h264_cabac: Tighten allowed coeff_abs range
...
Fixes: integer overflows
Reported-by: "Xiaohan Wang (王消寒)" <xhwang@chromium.org >
Based on limits in "8.5 Transform coefficient decoding process and picture
construction process prior to deblocking filter process"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f26a63c4ee )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Xiaohan Wang
f4ff8845e2
avcodec/h264_cavlc: Set valid qscale value in ff_h264_decode_mb_cavlc()
...
When ff_h264_decode_mb_cavlc() failed due to wrong sl->qscale values,
e.g. dquant out of range, set the qscale to be a valid value before
returning -1 and exiting the function. The qscale value can be used
later e.g. in loop filter.
BUG=806122
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 71f39de2a5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Michael Niedermayer
e38388fb09
avcodec/vp3: Error out on invalid num_coeffs in unpack_vlcs()
...
This fixes a hypothetical integer overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f2318aee8c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Michael Niedermayer
6098d54fbd
avcodec/mpeg4videodec: Ignore multiple VOL headers
...
Fixes: Ticket7005
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 63a4bdbf3b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Michael Niedermayer
218574f24b
avcodec/vp3: Check eob_run
...
Fixes: out of array access
Fixes: 5919/clusterfuzz-testcase-minimized-5859311382167552
Fixes: special case for theora (untested due to lack of sample)
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 570023eab3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 19:30:10 +02:00
Nekopanda
5aa07015d7
avcodec/mpeg2dec: Fix field selection for skipped macroblocks
...
For B field pictures, the spec says,
> The prediction shall be made from the field of the same parity as the field being predicted.
I did it.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8b154cb3e9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
40b7dc104a
avcodec/huffyuvdec: Check input buffer size
...
Fixes: Timeout
Fixes: 5487/clusterfuzz-testcase-4696837035393024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 08c220d26c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
22aa37c0fe
avcodec/utvideodec: Fix bytes left check in decode_frame()
...
Fixes: out of array read
Fixes: poc-2017.avi
Found-by: GwanYeong Kim <gy741.kim@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 118e1b0b33 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
7cc7346dfd
avcodec/wavpack: Fix integer overflow in FFABS
...
Fixes: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Fixes: 5396/clusterfuzz-testcase-minimized-6558555529281536
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8e50bd61e4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
7aed596664
avcodec/aacsbr_fixed: Fix overflows in rounding in sbr_hf_assemble()
...
Fixes: runtime error: signed integer overflow: 2052929346 + 204817098 cannot be represented in type 'int'
Fixes: 5275/clusterfuzz-testcase-minimized-5367635958038528
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b1bef755f6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
08deabae38
avcodec/dirac_dwt: Fix several integer overflows
...
Fixes: runtime error: signed integer overflow: -2146071175 + -268479557 cannot be represented in type 'int'
Fixes: 5237/clusterfuzz-testcase-minimized-4569895275593728
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fe1e6c06d0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
e67ae6dc19
avcodec/indeo5: Do not leave frame_type set to an invalid value
...
Fixes: null pointer dereference
Fixes: 5264/clusterfuzz-testcase-minimized-4621956621008896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2ff9f17851 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
2bf49f9b1c
avcodec/hevc_ps: Check log2_sao_offset_scale_*
...
Fixes: 4868/clusterfuzz-testcase-minimized-6236542906400768
Fixes: runtime error: shift exponent 126 is too large for 32-bit type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4a75a75c62 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Aman Gupta
55776eae21
avcodec/hevc_ps: extract one SPS fields required for hvcC construction
...
Signed-off-by: Aman Gupta <aman@tmm1.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
f7f814ade8
avcodec/mpeg4videodec: Avoid possibly aliasing violating casts
...
Found-by: kierank
Reviewed-by: Kieran Kunhya <kieran618@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d4967c04e0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
fbc5e36fdd
avcodec/get_bits: Document the return code of get_vlc2()
...
Found-by: kierank
Reviewed-by: Kieran Kunhya <kieran618@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4a94ff4ccd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
ef80b1402b
avcodec/mpeg4videodec: Check mb_num also against 0
...
The spec implies that 0 is invalid in addition to the existing checks
Found-by: <kierank>
Reviewed-by: Kieran Kunhya <kieran618@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 05f4703a16 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
c4ba170cad
avfilter/vf_transpose: Fix used plane count.
...
Fixes out of array access
Fixes: poc.mp4
Found-by: GwanYeong Kim <gy741.kim@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c6939f65a1 )
(cherry picked from commit 3f621455d6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
6abe8c7563
avcodec/hevc_cabac: Check prefix so as to avoid invalid shifts in coeff_abs_level_remaining_decode()
...
I suspect that this can be limited tighter, but i failed to find anything
in the spec that would confirm that.
Fixes: 4833/clusterfuzz-testcase-minimized-5302840101699584
Fixes: runtime error: left shift of 134217730 by 4 places cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a026a3efae )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
71524db178
avcodec/mjpegdec: Fix integer overflow in DC dequantization
...
Fixes: runtime error: signed integer overflow: -65535 * 65312 cannot be represented in type 'int'
Fixes: 4900/clusterfuzz-testcase-minimized-5769019744321536
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1bfc1aa004 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
7348bbf9c2
avcodec/dxtory: Fix bits left checks
...
Fixes: Timeout
Fixes: 4863/clusterfuzz-testcase-6347354178322432
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6e1a167c55 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
a8b92327f8
avcodec/hevc_cabac: Move prefix check in coeff_abs_level_remaining_decode() down
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 94d4237a7a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
d39b17f237
avcodec/truemotion2: Fix integer overflow in TM2_RECALC_BLOCK()
...
Fixes: signed integer overflow: 1477974040 - -1877995504 cannot be represented in type 'int'
Fixes: 4861/clusterfuzz-testcase-minimized-4570316383715328
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 56a53340ed )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
eea05ba855
avcodec/snowdec: Fix integer overflow before htaps check
...
Fixes: runtime error: signed integer overflow: -1094995529 * 2 cannot be represented in type 'int'
Fixes: 4828/clusterfuzz-testcase-minimized-5100849937252352
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2eecf3cf8e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
8ce2c38226
avcodec/ulti: Check number of blocks at init
...
Fixes: Timeout
Fixes: 4832/clusterfuzz-testcase-4699096590843904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 725353525e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Michael Niedermayer
7d79d8f6ef
avcodec/ac3dec_fixed: Fix integer overflow in scale_coefs()
...
Fixes: runtime error: signed integer overflow: 2147483520 + 128 cannot be represented in type 'int'
Fixes: 4800/clusterfuzz-testcase-minimized-6110372403609600
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a1f38c7589 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Nikolas Bowe
4eb8e1bce2
avformat/lrcdec: Fix memory leak in lrc_read_header()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ef5994e09d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
Nikolas Bowe
e7701e89ec
avformat/matroskadec: Fix float-cast-overflow undefined behavior in matroska_parse_tracks()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e07649e618 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-07-08 13:07:06 +02:00
James Almer
27fc118d1c
avdevice/iec61883: free the private context at the end
...
Fixes part of ticket #7146 .
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 5079e96bcc )
2018-04-18 23:01:33 -03:00
James Almer
53803ef71c
avdevice/iec61883: return reference counted packets
...
Fixes part of ticket #7146 , dealing with leaks of packet data since
commit 87c8812270 .
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit b8629654c6 )
2018-04-18 23:01:29 -03:00
Marton Balint
1fd992af60
avdevice/iec61883: free packet on buffer allocation error
...
Fixes Coverity CID 1396416.
Signed-off-by: Marton Balint <cus@passwd.hu >
(cherry picked from commit 4556dad2b7 )
2018-04-18 23:01:25 -03:00
James Almer
0a340924ef
avformat/hvcc: zero initialize the nal buffers past the last written byte
...
Prevents use of uninitialized values.
Fixes ticket #7038 .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 9482ec1b20 )
2018-02-24 00:37:41 -03:00
Tobias Rapp
1c3144751a
swresample/rematrix: fix update of channel matrix if input or output layout is undefined
...
Prefer direct in/out channel count values over channel layout, when
available. Fixes a pan filter bug (ticket #6790 ).
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
(cherry picked from commit 6325bd3717 )
2018-02-19 10:09:15 +01:00
Carl Eugen Hoyos
028a032a31
configure: bump year
...
Happy new year!
(cherry picked from commit bddf31ba75 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-13 04:02:06 +01:00
Michael Niedermayer
124a3ddc4b
Changelog: update
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-13 02:07:40 +01:00
Michael Niedermayer
fc7e3955ae
avcodec/utils: Avoid hardcoding duplicated types in sizeof()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 860d991fcd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-13 02:06:35 +01:00
Michael Niedermayer
acf1316167
avcodec/arm/sbrdsp_neon: Use a free register instead of putting 2 things in one
...
Fixes high pitched shriek
Fixes: 25420848_1478428308873746_4255813235963330560_n.mp4
Reported-by: Dale Curtis <dalecurtis@google.com >
Reviewed-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7dbbb75ee3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-13 02:06:35 +01:00
James Almer
24c49e0b42
changelog: update after previous commit
...
Signed-off-by: James Almer <jamrial@gmail.com >
2018-01-11 23:37:05 -03:00
James Almer
4fb5f391ae
avformat/libssh: check the user provided a password before trying to use it
...
Fixes ticket #6413
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 8ddb6820bd )
2018-01-11 10:37:11 -03:00
Michael Niedermayer
4fb4a642c6
Update for 3.2.10
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-09 01:54:06 +01:00
Michael Niedermayer
adfefc9c9a
avcodec/h264addpx_template: Fixes integer overflows
...
Fixes: signed integer overflow: 512 + 2147483491 cannot be represented in type 'int'
Fixes: 4780/clusterfuzz-testcase-minimized-4709066174627840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d6945aeee4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
1ab3e34cb4
avcodec/dirac_dwt: Fix overflows in COMPOSE_HAARiH0/COMPOSE_HAARiL0
...
Fixes: 4830/clusterfuzz-testcase-minimized-5255392054476800
Fixes: signed integer overflow: 2147483646 - -7 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0e62a23734 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
a9fb75893b
avcodec/diracdec: Fix integer overflow with quant
...
Fixes: signed integer overflow: 2 + 2147483646 cannot be represented in type 'int'
Fixes: 4792/clusterfuzz-testcase-minimized-6322450775146496
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit eaa9317589 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
c28752f03a
avcodec/opus_parser: Check payload_len in parse_opus_ts_header()
...
Fixes: clusterfuzz-testcase-minimized-6134545979277312
Fixes: crbug 797469
Reported-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1bcd7fefcb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
d89941aa89
avcodec/jpeg2000dsp: Fix integer overflows in ict_int()
...
Fixes: signed integer overflow: 46802 * -71230 cannot be represented in type 'int'
Fixes: 4756/clusterfuzz-testcase-minimized-4812495563784192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b3192c64b5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
3f86cc0680
avcodec/h264_slice: Do not attempt to render into frames already output
...
Fixes: null pointer dereference
Fixes: 4698/clusterfuzz-testcase-minimized-5096956322906112
This testcase does not reproduce the issue before 03b82b3ab9
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 476665d4de )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
c4ead1ab27
avcodec/dnxhddec: Check dc vlc
...
Fixes: signed integer overflow: 1024 + 2147483640 cannot be represented in type 'int'
Fixes: 4671/clusterfuzz-testcase-minimized-6027464343027712
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b2be76c0a4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Luca Barbato
6d654eb036
x264: Support version 153
...
It has native simultaneus 8 and 10 bit support.
(cherry picked from commit c6558e8840 )
(cherry picked from commit 96e8400553 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
439f3564fa
avcodec/exr: Check buf_size more completely
...
Fixes: Out of heap array read
Fixes: 4683/clusterfuzz-testcase-minimized-6152313673613312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 903be5e4f6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:15 +01:00
Michael Niedermayer
ab0e4b5b51
avcodec/flacdec: Fix overflow in multiplication in decode_subframe_fixed()
...
Fixes: signed integer overflow: 2 * 1629495328 cannot be represented in type 'int'
Fixes: 4716/clusterfuzz-testcase-minimized-5835915940331520
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3d23f7a096 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
34a9bef0c9
avcodec/hevcdsp_template: Fix Invalid shifts in put_hevc_qpel_bi_w_h() and put_hevc_qpel_bi_w_w()
...
Fixes: left shift of negative value -1
Fixes: 4690/clusterfuzz-testcase-minimized-6117482428366848
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d135f3c514 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
4be2a19822
avcodec/flacdec: avoid undefined shift
...
Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int'
Fixes: 4688/clusterfuzz-testcase-minimized-6572210748653568
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 560daf8891 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
954c2b07b6
avcodec/hevcdsp_template.c: Fix undefined shift in FUNC(dequant)
...
Fixes: runtime error: left shift of negative value -180
Fixes: 4626/clusterfuzz-testcase-minimized-5647837887987712
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0c9ab5ef9c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
2c60731777
avcodec/dirac_dwt: Fix integer overflow in COMPOSE_DD97iH0() and COMPOSE_DD137iL0()
...
Fixes: runtime error: signed integer overflow: 2147483646 + 33554433 cannot be represented in type 'int'
Fixes: 4563/clusterfuzz-testcase-minimized-5438979567517696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4d70fbeec8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
8bd6bf8214
avcodec/hevc_cabac: Fix integer overflow in ff_hevc_cu_qp_delta_abs()
...
Fixes: signed integer overflow: 2147483647 + 1073741824 cannot be represented in type 'int'
Fixes: 4555/clusterfuzz-testcase-minimized-4505532481142784
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0ee143558d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
9ad735588c
tests/audiomatch: Add missing return code at the end of main()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 65da5c56e6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
34cad2f0e2
avcodec/hevc_sei: Fix integer overflows in decode_nal_sei_message()
...
Fixes: signed integer overflow: 2147483520 + 255 cannot be represented in type 'int'
Fixes: 4554/clusterfuzz-testcase-minimized-4843714515042304
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 991ef6e5b9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
ce28047755
avcodec/hevcdsp_template: Fix undefined shift in put_hevc_qpel_bi_w_hv()
...
Fixes: runtime error: left shift of negative value -3
Fixes: 4524/clusterfuzz-testcase-minimized-6055590120914944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 439fbb9c8b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Kelly Ledford
235a55700b
libavfilter/af_dcshift.c: Fixed repeated spelling error
...
'threshhold' should be 'threshold'
Signed-off-by: Kelly Ledford <kelly.ledford@intel.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bc219082bb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Jun Zhao
1a6f38b31b
avfilter/formats: fix wrong function name in error message
...
Use perdefined micro __FUNCTION__ rather than hard coding function name
to fix wrong function name in error message.
Signed-off-by: Jun Zhao <jun.zhao@intel.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4280948702 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
969485aace
avcodec/amrwbdec: Fix division by 0 in voice_factor()
...
The added value matches "Digital cellular telecommunications system (Phase 2+) (GSM); Universal Mobile Telecommunications System (UMTS); LTE; Extended Adaptive Multi-Rate - Wideband (AMR-WB+) codec; Floating-point ANSI-C code (3GPP TS 26.304 version 14.0.0 Release 14)
Extended Adaptive Multi-Rate - Wideband (AMR-WB+) codec; Floating-point ANSI-C code"
Fixes: runtime error: division by zero
Fixes: 4415/clusterfuzz-testcase-minimized-4677752314658816
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1d0817d56b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
49efdb1e77
avcodec/diracdsp: Fix integer overflow in PUT_SIGNED_RECT_CLAMPED()
...
Fixes: runtime error: signed integer overflow: 2147483646 + 2048 cannot be represented in type 'int'
Fixes: 4479/clusterfuzz-testcase-minimized-6529894147162112
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 610dd74502 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
17b3485a67
avcodec/dirac_dwt: Fix integer overflows in COMPOSE_DAUB97*
...
Fixes: 4478/clusterfuzz-testcase-minimized-4752113767809024
Fixes: runtime error: signed integer overflow: -2147483626 + -319489 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5e9a13a5a3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Dale Curtis
91c7cc9726
avcodec/vorbis: Fix another 1 << 31 > int32_t::max() with 1u.
...
Didn't notice this one when 9648cc6d was landed.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 95bacb521a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Dale Curtis
32d1657192
Don't manipulate duration when it's AV_NOPTS_VALUE.
...
This leads to signed integer overflow.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit c5fd57f483 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Dale Curtis
e1a854da2d
avcodec/vorbis: 1 << 31 > int32_t::max(), so use 1u << 31 instead.
...
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9648cc6d7f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Dale Curtis
fc3e4c9ab3
avformat/utils: Prevent undefined shift with wrap_bits > 64.
...
2LL << (wrap_bits=64 - 1) does not fit in int64_t; change the
code to use a uint64_t (2ULL) and add an av_assert2() to
ensure wrap_bits <= 64.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 03fbc0daa7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
50dd0e43af
avcodec/j2kenc: Fix out of array access in encode_cblk()
...
Fixes: 4427/clusterfuzz-testcase-minimized-5106919271301120
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0674087004 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
e8a3b17dd4
avcodec/hevcdsp_template: Fix undefined shift in put_hevc_epel_bi_w_h()
...
Fixes: runtime error: left shift of negative value -127
Fixes: 4397/clusterfuzz-testcase-minimized-4779061080489984
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0409d33311 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
5ee4c376d0
avcodec/mlpdsp: Fix signed integer overflow, 2nd try
...
The outputted bits should match what is used in the lossless check
Fixes: runtime error: signed integer overflow: -538697856 * 256 cannot be represented in type 'int'
Fixes: 4326/clusterfuzz-testcase-minimized-5689449645080576
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 97c00edaa0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
857c5fa976
avcodec/kgv1dec: Check that there is enough input for maximum RLE compression
...
Fixes: Timeout
Fixes: 4271/clusterfuzz-testcase-4676667768307712
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3aad94bf2b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
42b9df5a98
avcodec/dirac_dwt: Fix integer overflow in COMPOSE_FIDELITYi*
...
Fixes: runtime error: signed integer overflow: -2143827186 - 7404944 cannot be represented in type 'int'
Fixes: 4354/clusterfuzz-testcase-minimized-4671122764201984
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2b6964f764 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
b48a36e773
avcodec/mpeg4videodec: Check also for negative versions in the validity check
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0e7865ce41 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Dale Curtis
02d11e616a
Close ogg stream upon error when using AV_EF_EXPLODE.
...
Without this there can be multiple memory leaks for unrecognized
ogg streams.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bce8fc0754 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Dale Curtis
13763f7192
Fix undefined shift on assumed 8-bit input.
...
decode_user_data() attempts to create an integer |build|
value with 8 bits of spacing for 3 components. However
each component is an int32_t, so shifting each component
is undefined for values outside of the 8 bit range.
This patch simply clamps input to 8-bits per component
and prints out a warning that the values were clamped.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7010dd98b5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Dale Curtis
380515e5b9
Use ff_thread_once for fixed, float table init.
...
These tables are static so they should only be initialized once
instead of on every call to ff_mpadsp_init().
Signed-off-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5eaaffaf64 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Jacob Trimble
a03d488ae2
avformat/mov: Propagate errors in mov_switch_root.
...
Signed-off-by: Jacob Trimble <modmaker@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2d9cf3bf16 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
c09c0ce374
avcodec/hevcdsp_template: Fix invalid shift in put_hevc_epel_bi_w_v()
...
Fixes: runtime error: left shift of negative value -255
Fixes: 4037/clusterfuzz-testcase-minimized-5290998163832832
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7d88586e47 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
81bf24a827
avcodec/mlpdsp: Fix undefined shift ff_mlp_pack_output()
...
Fixes: runtime error: left shift of negative value -7862264
Fixes: 4074/clusterfuzz-testcase-minimized-4516104123711488
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4f7f70738e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
d6ff6dc56b
avcodec/zmbv: Check that the buffer is large enough for mvec
...
Fixes: Timeout
Fixes: 4143/clusterfuzz-testcase-4736864637419520
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2ab9568a2c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
37a14a3d83
avcodec/dirac_dwt: Fix integer overflow in COMPOSE_DD137iL0()
...
Fixes: 4035/clusterfuzz-testcase-minimized-6479308925173760
Fixes: runtime error: signed integer overflow: 9 * 402653183 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 73964680d7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
5fdc679561
avcodec/wmv2dec: Check end of bitstream in parse_mb_skip() and ff_wmv2_decode_mb()
...
Fixes: Timeout
Fixes: 3200/clusterfuzz-testcase-5750022136135680
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 65e0a7c473 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
b24b316e30
avcodec/snowdec: Check for remaining bitstream in decode_blocks()
...
Fixes: Timeout
Fixes: 3142/clusterfuzz-testcase-5007853163118592
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4527ec2216 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
3e3e42dbc4
avcodec/snowdec: Check intra block dc differences.
...
Fixes: Timeout
Fixes: 3142/clusterfuzz-testcase-5007853163118592
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c3b9bbcc6e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Fredrik Hubinette
7d14046740
avformat/mov: Check size of STSC allocation
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a6fdd75fe6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
e69edb7aef
avcodec/vc2enc: Clear coef_buf on allocation
...
Fixes: Use of uninitialized memory
Fixes: assertion failure
Reviewed-by: <atomnuker>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6d00905f81 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
cbc839681b
avcodec/h264dec: Fix potential array overread
...
add padding before scantable arrays
See: 522d850e68
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 380b48fb9f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
b51f515c5c
avcodec/x86/mpegvideodsp: Fix signedness bug in need_emu
...
Fixes: out of array read
Fixes: 3516/attachment-311488.dat
Found-by: Insu Yun, Georgia Tech.
Tested-by: wuninsu@gmail.com
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 58cf31cee7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
4654cc8cee
avcodec/aacpsdsp_template: Fix integer overflows in ps_decorrelate_c()
...
Fixes: runtime error: signed integer overflow: 1939661764 - -454942263 cannot be represented in type 'int'
Fixes: 3191/clusterfuzz-testcase-minimized-5688798451073024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2afe05402f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
1fc3ebbcd9
avcodec/aacdec_fixed: Fix undefined shift
...
Fixes: runtime error: left shift of negative value -801112064
Fixes: 3492/clusterfuzz-testcase-minimized-5784775283441664
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fca198fb5b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
314d78992c
avcodec/mdct_*: Fix integer overflow in addition in RESCALE()
...
Fixes: runtime error: signed integer overflow: 1219998458 - -1469874012 cannot be represented in type 'int'
Fixes: 3443/clusterfuzz-testcase-minimized-5369987105554432
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 770c934fa1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
5f58877bd9
avcodec/snowdec: Fix integer overflow in header parsing
...
Fixes: 3984/clusterfuzz-testcase-minimized-5265759929368576
Fixes: runtime error: signed integer overflow: -1085585801 + -1094995529 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c897a92858 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
d857f1035b
avcodec/cngdec: Fix integer clipping
...
Fixes: runtime error: value -36211.7 is outside the range of representable values of type 'short'
Fixes: 2992/clusterfuzz-testcase-6649611793989632
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 51090133b3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
4730046891
avcodec/sbrdsp_fixed: Fix integer overflow in shift in sbr_hf_g_filt_c()
...
Fixes: runtime error: shift exponent 66 is too large for 64-bit type 'long long'
Fixes: 3642/clusterfuzz-testcase-minimized-5443853801750528
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 981e99ab99 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
4e87ab803a
avcodec/aacsbr_fixed: Fix division by zero in sbr_gain_calc()
...
Fixes: 3642/clusterfuzz-testcase-minimized-5443853801750528
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7d1dec4668 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
4d9f669a9f
avutil/softfloat: Add FLOAT_MIN
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e34fe61bf4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
7a8b61357c
avcodec/h264idct_template: Fix integer overflows in ff_h264_idct8_add()
...
Fixes: runtime error: signed integer overflow: -503316480 + -2013265038 cannot be represented in type 'int'
Fixes: 3805/clusterfuzz-testcase-minimized-6578427831255040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e131b8cedb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
d7c29005a4
avcodec/xan: Check for bitstream end in xan_huffman_decode()
...
Fixes: Timeout
Fixes: 3707/clusterfuzz-testcase-6465922706440192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4b51437dcc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
8b8502a66f
avcodec/exr: fix undefined shift in pxr24_uncompress()
...
Fixes: runtime error: left shift of 255 by 24 places cannot be represented in type 'int'
Fixes: 3787/clusterfuzz-testcase-minimized-5728764920070144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 66f0c958bf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Luca Barbato
d6ecc61db8
avformat: Free the internal codec context at the end
...
Avoid a use after free in avformat_find_stream_info.
(cherry picked from commit 9e4a5eb51b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
0bd6717c0f
avcodec/xan: Improve overlapping check
...
Fixes: memcpy-param-overlap
Fixes: 3612/clusterfuzz-testcase-minimized-6393461273001984
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e8fafef1db )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
8bd2ba44a1
avcodec/aacdec_fixed: Fix integer overflow in apply_dependent_coupling_fixed()
...
Fixes: runtime error: signed integer overflow: 623487 * 536870912 cannot be represented in type 'int'
Fixes: 3594/clusterfuzz-testcase-minimized-4650622935629824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 41d96af2a7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
fcfa854abd
avcodec/aacdec_fixed: Fix integer overflow in predict()
...
Fixes: runtime error: signed integer overflow: -2110708110 + -82837504 cannot be represented in type 'int'
Fixes: 3547/clusterfuzz-testcase-minimized-6009386439802880
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0976752420 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
7373064247
avcodec/jpeglsdec: Check for end of bitstream in ls_decode_line()
...
Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760
Fixes: Timeout
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f80224ed19 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Michael Niedermayer
374a2d2250
avcodec/jpeglsdec: Check ilv for being a supported value
...
Fixes: 1773/clusterfuzz-testcase-minimized-4832523987189760
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fe533628b9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2018-01-08 23:19:14 +01:00
Rostislav Pehlivanov
519a54cc19
vc2enc_dwt: pad the temporary buffer by the slice size
...
Since non-Haar wavelets need to look into pixels outside the frame, we
need to pad the buffer. The old factor of two seemed to be a workaround
that fact and only padded to the left and bottom. This correctly pads
by the slice size and as such reduces memory usage and potential
exploits.
Reported by Liu Bingchang.
Ideally, there should be no temporary buffer but the encoder is designed
to deinterleave the coefficients into the classical wavelet structure
with the lower frequency values in the top left corner.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
(cherry picked from commit 3228ac730c )
2017-11-09 02:10:46 +00:00
Michael Niedermayer
4b1e87dc32
Update for 3.2.9
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-26 21:48:07 +02:00
Fredrik Hubinette
b76dcd0786
avformat/id3v2: fix leak in chapter parsing
...
Reviewed-on: https://chromium-review.googlesource.com/439405
Reviewed-by: Dale Curtis <dalecurtis@chromium.org >
Signed-off-by: James Almer <jamrial@gmail.com >
2017-10-26 21:47:41 +02:00
Michael Niedermayer
70d0cc8221
avcodec/snowdec: Check mv_scale
...
Fixes: runtime error: signed integer overflow: 2 * -1094995530 cannot be represented in type 'int'
Fixes: 3512/clusterfuzz-testcase-minimized-4812747210489856
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 393d6fc739 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-15 00:45:24 +02:00
Michael Niedermayer
1959c0f9f9
avcodec/pafvideo: Check for bitstream end in decode_0()
...
Fixes: Timeout
Fixes: 3529/clusterfuzz-testcase-5057068371279872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9c85329cd0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-15 00:45:10 +02:00
Michael Niedermayer
f052d1df3e
avcodec/ffv1dec: Fix out of array read in slice counting
...
Fixes: test-201710.mp4
Found-by: 连一汉 <lianyihan@360.cn > and Zhibin Hu
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c20f4fcb74 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-13 13:02:23 +02:00
Michael Niedermayer
11f5a13196
avcodec/dirac_dwt: Fix integer overflow in COMPOSE_53iL0()
...
Fixes: runtime error: signed integer overflow: 2147483646 + 2 cannot be represented in type 'int'
Fixes: 3485/clusterfuzz-testcase-minimized-4940429332054016
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bdee75a4e7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-13 13:01:58 +02:00
Michael Niedermayer
b2c9771dd4
avcodec/mpeg_er: Clear mcsel in mpeg_er_decode_mb()
...
Fixes out of array read
Should fix: 3516/clusterfuzz-testcase-minimized-4608518562775040 (not reprodoceable)
Found-by: Insu Yun, Georgia Tech.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 127a362630 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-13 12:59:47 +02:00
Michael Niedermayer
16b07d59de
avcodec/mpeg4videodec: Use 64 bit intermediates for sprite delta
...
Fixes: runtime error: signed integer overflow: -104713 * 65536 cannot be represented in type 'int'
Fixes: 3453/clusterfuzz-testcase-minimized-5555554657239040
Fixes: 3528/clusterfuzz-testcase-minimized-6283628420005888
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e38f280fec )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-13 12:58:58 +02:00
Michael Niedermayer
0eb0b21c7f
avcodec/x86/lossless_videoencdsp: Fix handling of small widths
...
Fixes out of array access
Fixes: crash-huf.avi
Regression since: 6b41b44149
This could also be fixed by adding checks in the C code that calls the dsp
Found-by: Zhibin Hu and 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit df62b70de8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-05 01:33:26 +02:00
Michael Niedermayer
2db9b31996
avcodec/truemotion2: Fix integer overflows in tm2_high_chroma()
...
Fixes: runtime error: signed integer overflow: -1408475220 + -1408475220 cannot be represented in type 'int'
Fixes: 3336/clusterfuzz-testcase-minimized-5656839179993088
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 44874b4f5e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-05 01:30:02 +02:00
Michael Niedermayer
d9630deca4
avcodec/aacdec_template: Clear tns present flag on error
...
Fixes: 3444/clusterfuzz-testcase-minimized-6270352105668608
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit dcf9bae4a9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-05 01:29:44 +02:00
Michael Niedermayer
79bec49315
avcodec/proresdec2: SKIP_BITS() does not work with len=32
...
Fixes: invalid shift
Fixes: 3482/clusterfuzz-testcase-minimized-5446915875405824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c37138e01a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-05 01:28:21 +02:00
Michael Niedermayer
2293e5a78a
avcodec/hevcdsp_template: Fix undefined shift
...
Fixes: runtime error: left shift of negative value -255
Fixes: 3373/clusterfuzz-testcase-minimized-5604083912146944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fbdab6eca7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-05 01:27:59 +02:00
Michael Niedermayer
74b28c54d9
avcodec/jpeg2000: Check that codsty->log2_prec_widths/heights has been initialized
...
Fixes: OOM
Fixes: 2225/clusterfuzz-testcase-minimized-5505632079708160
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 64e034da95 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-10-05 01:26:57 +02:00
Michael Niedermayer
04be199f8e
avcodec/takdec: Fix integer overflow in decode_lpc()
...
Fixes: runtime error: signed integer overflow: 16748560 + 2143729712 cannot be represented in type 'int'
Fixes: 3202/clusterfuzz-testcase-minimized-4988291642294272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5d31f03a02 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-25 11:10:29 +02:00
Michael Niedermayer
9e8a636551
avcodec/proresdec2: Check bits in DECODE_CODEWORD(), fixes invalid shift
...
Fixes: runtime error: shift exponent 42 is too large for 32-bit type 'unsigned int'
Fixes: 3410/clusterfuzz-testcase-minimized-5313377960198144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4f5eaf0b59 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-25 11:10:14 +02:00
Michael Niedermayer
397674a3fb
avcodec/takdec: Fix integer overflows in decode_subframe()
...
Fixes: runtime error: signed integer overflow: -1562477869 + -691460395 cannot be represented in type 'int'
Fixes: 3196/clusterfuzz-testcase-minimized-4528307146063872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3dabb9c69d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-25 11:09:05 +02:00
Michael Niedermayer
720a44f3a3
avcodec/dirac_dwt: Fix integer overflow in COMPOSE_FIDELITYi*()
...
Fixes: runtime error: signed integer overflow: 161 * 13872281 cannot be represented in type 'int'
Fixes: 3295/clusterfuzz-testcase-minimized-4738998142500864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 67da2685e0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-24 02:43:52 +02:00
Michael Niedermayer
5cf5a1034c
avcodec/ffv1dec: Fix integer overflow in read_quant_table()
...
Fixes: runtime error: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int'
Fixes: 3361/clusterfuzz-testcase-minimized-5065842955911168
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d00fc952b6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-24 02:41:18 +02:00
Michael Niedermayer
6b66cd8c40
avcodec/svq3: Fix overflow in svq3_add_idct_c()
...
Fixes: runtime error: signed integer overflow: 2147392585 + 524288 cannot be represented in type 'int'
Fixes: 3348/clusterfuzz-testcase-minimized-4809500517203968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2c933c5168 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-24 02:40:59 +02:00
Michael Niedermayer
ab2d991382
avcodec/pngdec: Clean up on av_frame_ref() failure
...
Fixes: memleak
Fixes: 3203/clusterfuzz-testcase-minimized-4514553595428864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5480e82d77 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-20 03:09:14 +02:00
Michael Niedermayer
98f8f5b12f
Update for 3.2.8
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:23:15 +02:00
Michael Niedermayer
0a5251d28e
avcodec/hevc_ps: Fix c?_qp_offset_list size
...
Fixes: runtime error: index 5 out of bounds for type 'int8_t const[5]'
Fixes:3175/clusterfuzz-testcase-minimized-4736774054084608
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit abf3f9fa23 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
2cfabd8ce7
avcodec/shorten: Move buffer allocation and offset init to end of read_header()
...
They are time consuming operations, performing them after the other checks
improves the speed with damaged input dramatically.
Fixes: Timeout
Fixes: 2928/clusterfuzz-testcase-4992812120539136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 380659604f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
87ef295ddf
avcodec/jpeg2000dsp: Fix multiple integer overflows in ict_int()
...
Fixes: runtime error: signed integer overflow: 22553 * -188962 cannot be represented in type 'int'
Fixes: 3042/clusterfuzz-testcase-minimized-5174210131394560
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2d025e7428 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
03bf78eba6
avcodec/hevcdsp_template: Fix undefined shift in put_hevc_pel_bi_w_pixels
...
Fixes: runtime error: left shift of negative value -95
Fixes: 3077/clusterfuzz-testcase-minimized-4684917524922368
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c225da68cf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
f3c3cd5afb
avcodec/diracdec: Fix overflow in DC computation
...
Fixes: runtime error: signed integer overflow: 11896 + 2147483646 cannot be represented in type 'int'
Fixes: 3053/clusterfuzz-testcase-minimized-6355082062856192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b5995856a4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
256ebf8bb4
avcodec/dirac_vlc: limit res_bits in APPEND_RESIDUE()
...
Fixes: runtime error: left shift of 1073741838 by 1 places cannot be represented in type 'int32_t' (aka 'int')
Fixes: 3279/clusterfuzz-testcase-minimized-4564805744590848
Suggested-by: <atomnuker>
Reviewed-by: <atomnuker>
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d98d29a775 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Mark Wachsler
36c0958fbd
libavcodec/h264_parse: don't use uninitialized value when chroma_format_idc==0
...
When parsing a monochrome file, chroma_log2_weight_denom was used without
being initialized, which could lead to a bogus error message being printed, e.g.
[h264 @ 0x61a000026480] chroma_log2_weight_denom 24576 is out of range
It also could led to warnings using AddressSanitizer.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fde5c7dc79 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
4e4177dde2
avformat/asfdec: Fix DoS in asf_build_simple_index()
...
Fixes: Missing EOF check in loop
No testcase
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit afc9c683ed )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
c9527df274
avformat/mov: Fix DoS in read_tfra()
...
Fixes: Missing EOF check in loop
No testcase
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9cb4eb7728 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
372bb59438
avcodec/dirac_vlc: Fix invalid shift in ff_dirac_golomb_read_32bit()
...
Fixes: runtime error: shift exponent 64 is too large for 64-bit type 'residual' (aka 'unsigned long')
Fixes: 2838/clusterfuzz-testcase-minimized-6260066086813696
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c595139f1f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
d5b42af8e7
avcodec/dirac_dwt: Fix multiple overflows in 9/7 lifting
...
Fixes: runtime error: signed integer overflow: 1073901567 + 1073901567 cannot be represented in type 'int'
Fixes: 3124/clusterfuzz-testcase-minimized-454643435752652
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f71cd44147 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
2173539519
avcodec/diracdec: Fix integer overflow in INTRA_DC_PRED()
...
Fixes: runtime error: signed integer overflow: 1168175789 + 1168178473 cannot be represented in type 'int'
Fixes: 3081/clusterfuzz-testcase-minimized-4807564879462400
Fixes: 2844/clusterfuzz-testcase-minimized-5561715838156800
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2a0823ae96 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
孙浩(晓黑)
816f7337bf
avformat/mxfdec: Fix Sign error in mxf_read_primer_pack()
...
Fixes: 20170829B.mxf
Co-Author: 张洪亮(望初)" <wangchu.zhl@alibaba-inc.com >
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9d00fb9d70 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
孙浩(晓黑)
9cbac36026
avformat/mxfdec: Fix DoS issues in mxf_read_index_entry_array()
...
Fixes: 20170829A.mxf
Co-Author: 张洪亮(望初)" <wangchu.zhl@alibaba-inc.com >
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 900f39692c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
孙浩(晓黑)
a051de092e
avformat/nsvdec: Fix DoS due to lack of eof check in nsvs_file_offset loop.
...
Fixes: 20170829.nsv
Co-Author: 张洪亮(望初)" <wangchu.zhl@alibaba-inc.com >
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c24bcb5536 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
e29c9ef2d5
avcodec/snowdec: Fix integer overflow in decode_subband_slice_buffered()
...
Fixes: runtime error: signed integer overflow: 267 * 8388608 cannot be represented in type 'int'
Fixes: 2743/clusterfuzz-testcase-minimized-5820652076400640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 732f976456 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
50d726273e
avcodec/hevc_ps: Fix undefined shift in pcm code
...
Fixes: runtime error: shift exponent -1 is negative
Fixes: 3091/clusterfuzz-testcase-minimized-6229767969832960
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2a83866c9f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
a4cc1101cc
avcodec/sbrdsp_fixed: Fix undefined overflows in autocorrelate()
...
Fixes: runtime error: signed integer overflow: 8903997421129740175 + 354481484684609529 cannot be represented in type 'long'
Fixes: 2045/clusterfuzz-testcase-minimized-6751255865065472
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit eefb68c9c3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
d4fc6b211f
avformat/mvdec: Fix DoS due to lack of eof check
...
Fixes: loop.mv
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4f05e2e2dc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
孙浩 and 张洪亮(望初)
5bc9f70441
avformat/rl2: Fix DoS due to lack of eof check
...
Fixes: loop.rl2
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 96f24d1bee )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
孙浩 and 张洪亮(望初)
2bbef8ee27
avformat/rmdec: Fix DoS due to lack of eof check
...
Fixes: loop.ivr
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 124eb202e7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
孙浩 and 张洪亮(望初)
98e177c728
avformat/cinedec: Fix DoS due to lack of eof check
...
Fixes: loop.cine
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7e80b63ecd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
孙浩 and 张洪亮(望初)
f94517934b
avformat/asfdec: Fix DoS due to lack of eof check
...
Fixes: loop.asf
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7f9ec5593e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
2920c7cec0
avformat/hls: Fix DoS due to infinite loop
...
Fixes: loop.m3u
The default max iteration count of 1000 is arbitrary and ideas for a better solution are welcome
Found-by: Xiaohei and Wangchu from Alibaba Security Team
Previous version reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7ec414892d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
baca98fc09
ffprobe: Fix NULL pointer handling in color parameter printing
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 351e28f9a7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
726133b6d2
ffprobe: Fix null pointer dereference with color primaries
...
Found-by: AD-lab of venustech
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 837cb4325b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b2c39fcc3c0749490dc93bca80f56724878b55fe)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
3738a41830
avcodec/hevc_ps: Check delta_pocs in ff_hevc_decode_short_term_rps()
...
Fixes: integer overflow
Fixes: 2893/clusterfuzz-testcase-minimized-5809330567774208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2b44dcbc44 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
53a6cdf89d
avformat/rtpdec_h264: Fix heap-buffer-overflow
...
Fixes: rtp_sdp/poc.sdp
Found-by: Bingchang <l.bing.chang.bc@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c42a1388a6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Vitaly Buka
50cb32480b
avformat/aviobuf: Fix signed integer overflow in avio_seek()
...
Signed integer overflow is undefined behavior.
Detected with clang and -fsanitize=signed-integer-overflow
Signed-off-by: Vitaly Buka <vitalybuka@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit eca2a49716 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Vitaly Buka
74410f2aba
avformat/mov: Fix signed integer overflows with total_size
...
Signed integer overflow is undefined behavior.
Detected with clang and -fsanitize=signed-integer-overflow
Signed-off-by: Vitaly Buka <vitalybuka@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4a404cb5b9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Vitaly Buka
febea34f91
avcodec/utils: Fix signed integer overflow in rc_initial_buffer_occupancy initialization
...
Signed integer overflow is undefined behavior.
Detected with clang and -fsanitize=signed-integer-overflow
Signed-off-by: Vitaly Buka <vitalybuka@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8c2bb10ddf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
6da5e63ba7
avcodec/aacdec_template: Fix running cleanup in decode_ics_info()
...
Fixes: out of array read
Fixes: 2873/clusterfuzz-testcase-minimized-5924145713905664
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Previous version reviewed-by: Alex Converse <alex.converse@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6f03ffb47d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
d15b1da8bc
avcodec/me_cmp: Fix crashes on ARM due to misalignment
...
Adds a diff_pixels_unaligned()
Fixes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=872503
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bc488ec28a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
dc86479e5f
avcodec/dirac_dwt_template: Fix integer overflow in vertical_compose53iL0()
...
Fixes: runtime error: signed integer overflow: 2147483646 + 2 cannot be represented in type 'int'
Fixes: 3013/clusterfuzz-testcase-minimized-4644084197097472
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a165b53daa )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
98cd9cd4c2
avcodec/fic: Fixes signed integer overflow
...
Fixes: runtime error: signed integer overflow: 1037142357 + 1227025305 cannot be represented in type 'int'
Fixes: 3024/clusterfuzz-testcase-minimized-5885660323905536
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0c9d5b015c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
bd09e3b19c
avcodec/snowdec: Fix off by 1 error
...
Fixes: runtime error: index 4 out of bounds for type 'int8_t [4]'
Fixes: 3023/clusterfuzz-testcase-minimized-6421736130084864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d132683ddd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
5bc3b18e3d
avcodec/diracdec: Fixes integer overflow
...
Fixes: runtime error: signed integer overflow: 340018243 * 27 cannot be represented in type 'int'
Fixes: 2861/clusterfuzz-testcase-minimized-5361070510178304
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 92da23093c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
952393b69e
avcodec/diracdec: Check perspective_exp and zrs_exp.
...
Fixes: undefined shift
Fixes: runtime error: shift exponent 264 is too large for 32-bit type 'int'
Fixes: 2860/clusterfuzz-testcase-minimized-4672811689836544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1e6cab8745 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
04db307c77
avcodec/ffv1dec_template: Fix undefined shift
...
Fixes: runtime error: left shift of negative value -127
Fixes: 2834/clusterfuzz-testcase-minimized-5988039123795968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 62702eebde )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
342d5c20ce
avcodec/mpeg4videodec: Clear mcsel before decoding an image
...
Fixes: runtime error: signed integer overflow: 2146467840 + 1032192 cannot be represented in type 'int'
Fixes: 2826/clusterfuzz-testcase-minimized-5901511613743104
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7735ed2974 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
52c4069119
avcodec/dirac_dwt: Fixes integer overflows in COMPOSE_DAUB97*
...
Fix multiple: runtime error: signed integer overflow: 6497 * 3409630 cannot be represented in type 'int'
Fixes: 2819/clusterfuzz-testcase-minimized-4743700301217792
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a5380f9c1c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
e595087048
avcodec/aacdec_fixed: fix invalid shift in predict()
...
Fixes: runtime error: shift exponent -2 is negative
Fixes: 2818/clusterfuzz-testcase-minimized-5062943676825600
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1e443051b2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
b66aa37834
avcodec/h264_slice: Fix overflow in slice offset
...
Fixes: runtime error: signed integer overflow: 1610612736 * 2 cannot be represented in type 'int'
Fixes: 2817/clusterfuzz-testcase-minimized-5289691240726528
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1f53bde6d8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Steven Siloti
16ee405707
avformat/utils: fix memory leak in avformat_free_context
...
The pointer to the packet queue is stored in the internal structure
so the queue needs to be flushed before internal is freed.
Signed-off-by: Steven Siloti <ssiloti@bittorrent.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 949debd1d1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
19938f1a11
avcodec/diracdsp: fix integer overflow
...
Fixes: runtime error: signed integer overflow: 11 * 225726413 cannot be represented in type 'int'
Fixes: 2764/clusterfuzz-testcase-minimized-5382561922547712
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b2d9d72269 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Michael Niedermayer
892ceb512f
avcodec/diracdec: Check weight_log2denom
...
Fixes: runtime error: shift exponent -1 is negative
Fixes: 2742/clusterfuzz-testcase-minimized-5724322402402304
Fixes: 2744/clusterfuzz-testcase-minimized-4672435653705728
Fixes: 2749/clusterfuzz-testcase-minimized-5298741273690112
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 880f5c5913 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-09-17 12:21:32 +02:00
Muhammad Faiz
5987b16f86
avfilter/vf_ssim: fix temp size calculation
...
Also use av_mallocz_array.
Fix Ticket6519.
Reviewed-by: Tobias Rapp <t.rapp@noa-archive.com >
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
(cherry picked from commit f2d23ec03f )
2017-08-06 16:25:33 +07:00
Michael Niedermayer
66395ac32b
Update for 3.2.7
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-30 12:22:51 +02:00
Michael Niedermayer
e889397924
avcodec/dirac_dwt: Fix multiple integer overflows in COMPOSE_DD97iH0()
...
Fixes: runtime error: signed integer overflow: 9 * 335544320 cannot be represented in type 'int'
Fixes: 2739/clusterfuzz-testcase-minimized-6737297955356672
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bf8ab72ae9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-29 19:13:20 +02:00
Michael Niedermayer
7827b06d77
avcodec/diracdec: Fix integer overflow in divide3()
...
Fixes: runtime error: signed integer overflow: -1073746548 * 21845 cannot be represented in type 'int'
Fixes: 2729/clusterfuzz-testcase-minimized-5902915464069120
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c0220c768c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-29 14:23:24 +02:00
Michael Niedermayer
bae812711a
avcodec/takdec: Fix integer overflow in decode_subframe()
...
Fixes: runtime error: signed integer overflow: -536870912 - 1972191120 cannot be represented in type 'int'
Fixes: 2711/clusterfuzz-testcase-minimized-4975142398590976
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2c630d159f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-29 14:18:34 +02:00
Michael Niedermayer
b375cc8bb7
avformat/rtmppkt: Convert ff_amf_get_field_value() to bytestream2
...
Fixes: out of array accesses
Found-by: JunDong Xie of Ant-financial Light-Year Security Lab
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ffcc82219c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-29 14:17:57 +02:00
Michael Niedermayer
f2a6f41dd7
avformat/rtmppkt: Convert ff_amf_tag_size() to bytestream2
...
Fixes: out of array accesses
Fixes: crash-9238fa9e8d4fde3beda1f279626f53812cb001cb-SEGV
Found-by: JunDong Xie of Ant-financial Light-Year Security Lab
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 08c073434e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-29 04:49:46 +02:00
Michael Niedermayer
8c7b477b97
avcodec/diracdec: Fix integer overflow in signed multiplication in UNPACK_ARITH()
...
Fixes: runtime error: signed integer overflow: 1073741823 * 4 cannot be represented in type 'int'
Fixes: 2729/clusterfuzz-testcase-minimized-5902915464069120
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8e275a74b0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-28 03:41:08 +02:00
Michael Niedermayer
6a10b962e3
avcodec/dnxhddec: Move mb height check out of non hr branch
...
Fixes: out of array access
Fixes: poc.dnxhd
Found-by: Bingchang, Liu@VARAS of IIE
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 296debd213 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-27 03:11:19 +02:00
Michael Niedermayer
efb649467c
avcodec/hevc_ps: fix integer overflow in log2_parallel_merge_level_minus2
...
Fixes: runtime error: signed integer overflow: -2147483647 - 2 cannot be represented in type 'int'
Fixes: 2702/clusterfuzz-testcase-minimized-4511932591636480
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 74c1c22d7f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-26 17:24:26 +02:00
Michael Niedermayer
6cc7777d4b
avformat/oggparsecelt: Do not re-allocate os->private
...
Fixes: double free
Fixes: clusterfuzz-testcase-minimized-5080550145785856
Found-by: ClusterFuzz
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7140761481 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-26 00:14:57 +02:00
Michael Niedermayer
00b0d595eb
avcodec/ylc: Fix shift overflow
...
Fixes: runtime error: shift exponent 32 is too large for 32-bit type 'unsigned int'
Fixes: 2698/clusterfuzz-testcase-minimized-4713541443518464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 03a9e6ff30 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-26 00:14:21 +02:00
Michael Niedermayer
b905d2948a
avcodec/aacps: Fix multiple integer overflow in map_val_34_to_20()
...
Fixes: avcodec/aacps.c:511:40: runtime error: signed integer overflow: 1509077651 + 758068176 cannot be represented in type 'int'
Fixes: 2678/clusterfuzz-testcase-minimized-4702787684270080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0764fe1d09 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-26 00:14:02 +02:00
Michael Niedermayer
7f638d56bd
avcodec/aacdec_fixed: fix: left shift of negative value -1
...
Fixes: 2699/clusterfuzz-testcase-minimized-5631303862976512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2dfb8c4178 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-26 00:11:55 +02:00
Michael Niedermayer
c368f07565
avcodec/dirac_vlc: Fix undefined shift
...
Fixes: runtime error: shift exponent 64 is too large for 64-bit type 'residual' (aka 'unsigned long')
Fixes: 2674/clusterfuzz-testcase-minimized-4999700518273024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 69e7daf6ce )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-24 03:03:15 +02:00
Brice Waegeneire
79f6269fd0
doc/filters: typo in frei0r
...
Signed-off-by: Brice Waegeneire <brice.wge@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6a6eec485d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-23 15:01:03 +02:00
Vodyannikov Aleksandr
539dc1746a
avcodec/cfhd: Fix decoding regression due to height check
...
Fixes: Ticket6546
Regression since: 54aaadf648
Reviewed-by: Muhammad Faiz <mfcc64@gmail.com >
Reviewed-by: Kieran Kunhya <kierank@obe.tv >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 47c9365724 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-23 15:00:52 +02:00
Michael Niedermayer
97e35bc40b
avcodec/aacdec_template (fixed point): Check gain in decode_cce() to avoid undefined shifts later
...
Fixes: runtime error: shift exponent 47 is too large for 32-bit type 'int'
Fixes: 2581/clusterfuzz-testcase-minimized-4681474395602944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2886142e0c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 04:03:09 +02:00
Michael Niedermayer
13c0467c49
avcodec/ffv1dec_template: Fix signed integer overflow
...
Fixes: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Fixes: 2634/clusterfuzz-testcase-minimized-4540890636877824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4de4308d2a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 03:54:53 +02:00
Michael Niedermayer
3abe6554c1
avcodec/aacdec_template: Fix undefined integer overflow in apply_tns()
...
Fixes: runtime error: signed integer overflow: -2147483648 - 1202286525 cannot be represented in type 'int'
Fixes: 2071/clusterfuzz-testcase-minimized-6036414271586304
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0ef8f03133 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 03:54:38 +02:00
Michael Niedermayer
aa01a35dd5
avcodec/magicyuv: Check that vlc len is not too large
...
Fixes: runtime error: shift exponent -95 is negative
Fixes: 2568/clusterfuzz-testcase-minimized-4926115716005888
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 341f01290c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 03:53:22 +02:00
Michael Niedermayer
fa427bdb59
avcodec/mjpegdec: Clip DC also on the negative side.
...
Fixes: runtime error: signed integer overflow: -16711425 + -2130772346 cannot be represented in type 'int'
Fixes: 2533/clusterfuzz-testcase-minimized-5372857678823424
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c28f648b19 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 03:47:59 +02:00
Michael Niedermayer
1268784d9f
avcodec/aacps (fixed point): Fix multiple signed integer overflows
...
Fixes: runtime error: signed integer overflow: 1421978265 - -1810326882 cannot be represented in type 'int'
Fixes: 2527/clusterfuzz-testcase-minimized-5260915396050944
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 80b9e40b6f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 03:47:44 +02:00
Michael Niedermayer
6405c66a51
avcodec/ylc: Fix vlc of 31 bits
...
Fixes: runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
Fixes: 2515/clusterfuzz-testcase-minimized-6197200012967936
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fe9242204d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 03:40:21 +02:00
Michael Niedermayer
a76db7176a
avcodec/sbrdsp_fixed: Fix integer overflow in sbr_hf_apply_noise()
...
Fixes: runtime error: signed integer overflow: -2049425300 + -117591631 cannot be represented in type 'int'
Fixes: part of 2096/clusterfuzz-testcase-minimized-4901566068817920
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2061de8a3f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 03:39:52 +02:00
Michael Niedermayer
a954b531f6
avcodec/wavpack: Fix invalid shift
...
Fixes: runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
Fixes: 2377/clusterfuzz-testcase-minimized-6108505935183872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c07af72098 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 02:50:33 +02:00
Michael Niedermayer
aaecd2ef68
avcodec/h264_slice: Fix signed integer overflow
...
Fixes: runtime error: signed integer overflow: 26 + 2147483644 cannot be represented in type 'int'
Fixes: 2456/clusterfuzz-testcase-minimized-4822695051001856
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7592d97f10 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 02:50:18 +02:00
Michael Niedermayer
2b85709bee
avcodec/hevc_ps: Fix integer overflow with beta/tc offsets
...
Fixes: runtime error: signed integer overflow: 2113929216 * 2 cannot be represented in type 'int'
Fixes: 2422/clusterfuzz-testcase-minimized-5242114713583616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit de54a37c1d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 02:50:00 +02:00
Michael Niedermayer
d986096963
avcodec/cfhd: Fix invalid left shift of negative value
...
Fixes: runtime error: left shift of negative value -1
Fixes: 2395/clusterfuzz-testcase-minimized-6540529313513472
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c709f009da )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 02:49:03 +02:00
Michael Niedermayer
20ce366fee
avcodec/vb: Check vertical GMC component before multiply
...
Fixes: runtime error: signed integer overflow: 8224 * 663584 cannot be represented in type 'int'
Fixes: 2393/clusterfuzz-testcase-minimized-6128334993883136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bc6ab72bc7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 02:48:39 +02:00
Michael Niedermayer
bbf911b660
avcodec/jpeg2000dwt: Fix integer overflow in dwt_decode97_int()
...
Fixes: runtime error: signed integer overflow: -163654656 * 256 cannot be represented in type 'int'
Fixes: 2367/clusterfuzz-testcase-minimized-4648678897745920
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ea5366670e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-19 02:45:51 +02:00
Michael Niedermayer
5bb861d45b
avcodec/apedec: Fix integer overflow
...
Fixes: out of array access
Fixes: PoC.ape and others
Found-by: Bingchang, Liu@VARAS of IIE
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ba4beaf614 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-07-16 17:02:30 +02:00
Michael Niedermayer
fc24783c6d
avcodec/wavpack: Fix integer overflow in wv_unpack_stereo()
...
Fixes: runtime error: signed integer overflow: 2080374785 + 2080374784 cannot be represented in type 'int'
Fixes: 2351/clusterfuzz-testcase-minimized-5359403240783872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 73ea2a028e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-25 02:52:40 +02:00
Michael Niedermayer
a2bde1363c
avcodec/mpeg4videodec: Fix GMC with videos of dimension 1
...
Fixes: runtime error: shift exponent -1 is negative
Fixes: 2338/clusterfuzz-testcase-minimized-5153426541379584
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4976a3411f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-25 02:48:00 +02:00
Michael Niedermayer
a7c0243e2f
avcodec/wavpack: Fix integer overflow
...
Fixes: runtime error: signed integer overflow: 227511904 + 1964113935 cannot be represented in type 'int'
Fixes: 2331/clusterfuzz-testcase-minimized-6182185830711296
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 24e95f9d4d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-23 03:05:54 +02:00
Michael Niedermayer
00a6211b45
avcodec/takdec: Fix integer overflow
...
Fixes: runtime error: signed integer overflow: 512 + 2147483146 cannot be represented in type 'int'
Fixes: 2314/clusterfuzz-testcase-minimized-4519333877252096
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0c2ef4f6b4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-23 03:05:43 +02:00
Michael Niedermayer
220ee7e583
avcodec/tiff: Update pointer only when the result is used
...
Fixes: runtime error: signed integer overflow: 538976288 * 32 cannot be represented in type 'int'
Fixes: 2310/clusterfuzz-testcase-minimized-4534784887881728
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 27f80ab016 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-23 03:05:33 +02:00
Michael Niedermayer
9bca2f698b
avcodec/cfhd: Check bpc before setting bpc in context
...
Fixes: runtime error: shift exponent 32 is too large for 32-bit type 'int'
Fixes: 2306/clusterfuzz-testcase-minimized-5002997392211968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6f1d2355a7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:09:17 +02:00
Michael Niedermayer
6d951be24d
avcodec/cfhd: Fix undefined shift
...
Fixes: runtime error: left shift of negative value -1
Fixes: 2303/clusterfuzz-testcase-minimized-5529675273076736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5a950f4e32 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:08:57 +02:00
Michael Niedermayer
80dc5b497e
avcodec/hevc_filter: Fix invalid shift
...
Fixes: runtime error: left shift of negative value -1
Fixes: 2299/clusterfuzz-testcase-minimized-4843509351710720
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d7b3d5c3f2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:08:44 +02:00
Michael Niedermayer
dd4fd80fe6
avcodec/mpeg4videodec: Fix overflow in virtual_ref computation
...
Fixes: runtime error: signed integer overflow: 262144 * -16120 cannot be represented in type 'int'
Fixes: 2292/clusterfuzz-testcase-minimized-6156080415506432
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5443c4bdf4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:08:34 +02:00
Michael Niedermayer
b97e0e98b4
avcodec/lpc: signed integer overflow in compute_lpc_coefs() (aacdec_fixed)
...
Fixes: runtime error: signed integer overflow: -1575818955 + -915383657 cannot be represented in type 'int'
Fixes: 2224/clusterfuzz-testcase-minimized-6208559949807616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e95fcfe8fb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:08:22 +02:00
Michael Niedermayer
9125bbb3e5
avcodec/wavpack: Fix undefined integer negation
...
Fixes: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Fixes: 2291/clusterfuzz-testcase-minimized-5538453481586688
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5f89747086 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:07:19 +02:00
Michael Niedermayer
27ad04e128
avcodec/aacdec_fixed: Check s for being too small
...
Fixes: runtime error: shift exponent -8 is negative
Fixes: 2286/clusterfuzz-testcase-minimized-5711764169687040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cf7edbd6c5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:07:07 +02:00
Michael Niedermayer
66735ddd72
avcodec/htmlsubtitles: Replace very slow redundant sscanf() calls by cleaner and faster code
...
This reduces the worst case from O(n²) to O(n) time
Fixes Timeout
Fixes: 2127/clusterfuzz-testcase-minimized-6595787859427328
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4132218b87 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-22 03:06:42 +02:00
Anton Mitrofanov
f7addaece8
avcodec/h264: Fix mix of lossless and lossy MBs decoding
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit cf231b68da )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-20 03:09:08 +02:00
Anton Mitrofanov
b36c97a0ae
avcodec/h264_mb: Fix 8x8dct in lossless for new versions of x264
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit 06dda70f1e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-20 03:03:12 +02:00
Anton Mitrofanov
312f96053a
avcodec/h264_cabac: Fix CABAC+8x8dct in 4:4:4
...
Use the correct ctxIdxInc calculation for coded_block_flag.
Keep old behavior for old versions of x264 for backward compatibility.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
(cherry picked from commit 840b41b2a6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-20 01:53:29 +02:00
Michael Niedermayer
e5d9f0c3cd
avcodec/takdec: Fixes: integer overflow in AV_SAMPLE_FMT_U8P output
...
Fixes: runtime error: signed integer overflow: 2147483543 + 128 cannot be represented in type 'int'
Fixes: 2234/clusterfuzz-testcase-minimized-6266896041115648
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 27c2006805 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-18 15:17:13 +02:00
Michael Niedermayer
431ccd3f55
Changelog: update
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-18 00:49:16 +02:00
Michael Niedermayer
74cf081ef0
avcodec/jpeg2000dsp: Reorder operations in ict_int() to avoid 2 integer overflows
...
Fixes: runtime error: signed integer overflow: 58065 * 51981 cannot be represented in type 'int'
Fixes: 2271/clusterfuzz-testcase-minimized-5778297776504832
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c746f92a8e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-17 23:34:47 +02:00
Michael Niedermayer
b7362f3c6b
avcodec/hevcpred_template: Fix left shift of negative value
...
Fixes: runtime error: left shift of negative value -1
Fixes: 2250/clusterfuzz-testcase-minimized-5693382112313344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c94326c1fc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-17 23:34:18 +02:00
Michael Niedermayer
1a54f239ad
Update for 3.2.6
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-17 02:30:36 +02:00
Michael Niedermayer
a2055f8e3f
avcodec/hevcdec: Fix signed integer overflow in decode_lt_rps()
...
Fixes: runtime error: signed integer overflow: 2147483647 + 6 cannot be represented in type 'int'
Fixes: 2263/clusterfuzz-testcase-minimized-4800359627227136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1edbf5e20c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-17 02:25:54 +02:00
Michael Niedermayer
c00ef60abd
avcodec/jpeg2000dec: Check nonzerobits more completely
...
Fixes: runtime error: shift exponent 36 is too large for 32-bit type 'int'
Fixes: 2239/clusterfuzz-testcase-minimized-5639766592716800
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit dfb61ea263 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-17 02:25:27 +02:00
Michael Niedermayer
12cf6ace44
avcodec/shorten: Sanity check maxnlpc
...
Fixes OOM
Fixes: 2131/clusterfuzz-testcase-minimized-4718045157130240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e77ddd31a8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-17 02:23:53 +02:00
Michael Niedermayer
39d9308b99
avcodec/truemotion2: Move skip computation after checks
...
Fixes: runtime error: signed integer overflow: 630067357 * 4 cannot be represented in type 'int'
Fixes: 2233/clusterfuzz-testcase-minimized-5943031318446080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3c716682a8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-17 02:23:07 +02:00
Michael Niedermayer
d09ec6c27f
avcodec/jpeg2000: Fixes integer overflow in ff_jpeg2000_ceildivpow2()
...
Fixes: runtime error: negation of -2147483648 cannot be represented in type 'int'; cast to an unsigned type to negate this value to itself
Fixes: 2231/clusterfuzz-testcase-minimized-4565181982048256
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e3fadc57c5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:43:37 +02:00
Michael Niedermayer
31c1c0b46a
avcodec/dnxhd_parser: Do not return invalid value from dnxhd_find_frame_end() on error
...
Fixes: Null pointer dereference
Fixes: CVE-2017-9608
Found-by: Yihan Lian
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 611b356274 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:15:51 +02:00
Michael Niedermayer
6d77a3ff3c
avcodec/hevcdec: Check nb_sps
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bc40674462 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
81527019b1
avcodec/hevc_refs: Check nb_refs in add_candidate_ref()
...
Fixes: runtime error: index 16 out of bounds for type 'int [16]'
Fixes: 2209/clusterfuzz-testcase-minimized-5012343912136704
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1cb4ef526d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
3c6aa2e0d1
avcodec/mpeg4videodec: Check sprite delta upshift against overflowing.
...
Fixes: runtime error: signed integer overflow: -268386304 * 16 cannot be represented in type 'int'
Fixes: 2204/clusterfuzz-testcase-minimized-5616756909408256
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 12245ab1f6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
46acaabd2a
avcodec/mpeg4videodec: Fix integer overflow in num_sprite_warping_points=2 case
...
Fixes: runtime error: signed integer overflow: 131072 + 2147352576 cannot be represented in type 'int'
Fixes: 2192/clusterfuzz-testcase-minimized-5370387988742144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0a87be404a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
c1e2c1e84e
avcodec/aacsbr_fixed: Check shift in sbr_hf_assemble()
...
Fixes: runtime error: shift exponent -10 is negative
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d1992448d3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
15a408f182
avcodec/sbrdsp_fixed: Return an error from sbr_hf_apply_noise() if operations are impossible
...
Fixes: 1775/clusterfuzz-testcase-minimized-5330288148217856
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d549f026d8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
22a6713ce9
avcodec/libvpxdec: Check that display dimensions fit in the storage dimensions
...
Fixes assertion failure
Fixes: 2112/clusterfuzz-testcase-minimized-4526878557732864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f8593c2f49 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
61bf10368c
avcodec/jpeg2000dwt: Fix runtime error: left shift of negative value -123
...
Fixes: 2208/clusterfuzz-testcase-minimized-5976593765761024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d24043e1a2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
266ecedc75
avcodec/wavpack: Fix runtime error: signed integer overflow: 1886191616 + 277872640 cannot be represented in type 'int'
...
Fixes: 2181/clusterfuzz-testcase-minimized-6314784322486272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c996374d4d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
753d04b618
avcodec/snowdec: Fix runtime error: left shift of negative value -1
...
Fixes: 2197/clusterfuzz-testcase-minimized-6010716676947968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2e44126363 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
1df8547366
avcodec/aacdec_fixed: Fix runtime error: left shift of negative value -1297616
...
Fixes: 2195/clusterfuzz-testcase-minimized-4736721533009920
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6d499ecef9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
722cbfc5e1
avcodec/tiff: Fix leak of geotags[].val
...
Fixes: 2176/clusterfuzz-testcase-minimized-5908197216878592
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 22a25ab389 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
9a8419541f
avcodec/ra144: Fix runtime error: signed integer overflow: -2200 * 1033073 cannot be represented in type 'int'
...
Fixes: 2175/clusterfuzz-testcase-minimized-5809657849315328
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 71da0a5c97 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
ef157cec81
avcodec/flicvideo: Fix runtime error: signed integer overflow: 4864 * 459296 cannot be represented in type 'int'
...
Fixes: 2174/clusterfuzz-testcase-minimized-5739234533048320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 90e8317b3b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
1f1b73cb16
avcodec/cfhd: Check band parameters before storing them
...
Fixes out of array read
Fixes: 2169/clusterfuzz-testcase-minimized-5688641642823680
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 54aaadf648 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:30 +02:00
Michael Niedermayer
e5714e4ccb
avcodec/h264_parse: Check picture structure when initializig weight table
...
Fixes: runtime error: index 49 out of bounds for type 'int [48][2][2]'
Fixes: 2159/clusterfuzz-testcase-minimized-5267945972301824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3a1ad368a78b153b63ccc07af864b3611e2a4ac3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
e93ffb4888
avcodec/indeo4: Check remaining data in Pic hdr extension parsing code
...
Fixes: Timeout
Fixes: 2115/clusterfuzz-testcase-minimized-6594111748440064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a3b5b60bdf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
f7ea74422f
avcodec/ac3dec_fixed: Fix multiple runtime error: signed integer overflow: -39271008 * 59 cannot be represented in type 'int'
...
Fixes: 2113/clusterfuzz-testcase-minimized-6510704959946752
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4e3ab1a5c1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
d528414568
avcodec/mpeg4videodec: Fix runtime error: signed integer overflow: 53098 * 40448 cannot be represented in type 'int'
...
Fixes: 2106/clusterfuzz-testcase-minimized-6136503639998464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 18bca25adb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
fe5b764e6a
avcodec/pafvideo: Fix assertion failure
...
Fixes: 2100/clusterfuzz-testcase-minimized-4522961547558912
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c4360559ee )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
f865aa6bee
avcodec/takdec: Fix multiple runtime error: signed integer overflow: 637072 * 4096 cannot be represented in type 'int'
...
Fixes: 2079/clusterfuzz-testcase-minimized-5345861779324928
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e4efd41b83 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
873397e27e
avcodec/mjpegdec: Check that reference frame matches the current frame
...
Fixes: out of array read
Fixes: 2097/clusterfuzz-testcase-minimized-5036861833609216
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4705edbbb9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
260a286e53
avcodec/tiff: Avoid loosing allocated geotag values
...
Fixes memleak
Fixes: 2076/clusterfuzz-testcase-minimized-6542640243802112
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d7cbeab4c1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
fb0d1cafab
avcodec/cavs: Fix runtime error: signed integer overflow: -12648062 * 256 cannot be represented in type 'int'
...
Fixes: 2067/clusterfuzz-testcase-minimized-5578430902960128
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1e6ee86d92 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
25dac3128b
avformat/hls: Check local file extensions
...
This reduces the attack surface of local file-system
information leaking.
It prevents the existing exploit leading to an information leak. As
well as similar hypothetical attacks.
Leaks of information from files and symlinks ending in common multimedia extensions
are still possible. But files with sensitive information like private keys and passwords
generally do not use common multimedia filename extensions.
It does not stop leaks via remote addresses in the LAN.
The existing exploit depends on a specific decoder as well.
It does appear though that the exploit should be possible with any decoder.
The problem is that as long as sensitive information gets into the decoder,
the output of the decoder becomes sensitive as well.
The only obvious solution is to prevent access to sensitive information. Or to
disable hls or possibly some of its feature. More complex solutions like
checking the path to limit access to only subdirectories of the hls path may
work as an alternative. But such solutions are fragile and tricky to implement
portably and would not stop every possible attack nor would they work with all
valid hls files.
Developers have expressed their dislike / objected to disabling hls by default as well
as disabling hls with local files. There also where objections against restricting
remote url file extensions. This here is a less robust but also lower
inconvenience solution.
It can be applied stand alone or together with other solutions.
limiting the check to local files was suggested by nevcairiel
This recommits the security fix without the author name joke which was
originally requested by Nicolas.
Found-by: Emil Lerner and Pavel Cheremushkin
Reported-by: Thierry Foucu <tfoucu@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 189ff42196 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
5c82f67012
avcodec/qdrw: Fix null pointer dereference
...
The RGB555 PACKBITSRGN case tries to read a palette, if such
palette is actually stored then it accesses a null pointer.
All 16bit samples i could find use DIRECTBITSRGN.
Fixes: 2065/clusterfuzz-testcase-minimized-6298930457346048
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 46b865ea9f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
25b7dc959a
avutil/softfloat: Fix sign error in and improve documentation of av_int2sf()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6019d721d4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
5c2c0979e2
avcodec/hevc_ps: Fix runtime error: index 32 out of bounds for type 'uint8_t [32]'
...
Fixes: 2010/clusterfuzz-testcase-minimized-6209288450080768
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 29808fff33 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
439757d38a
avcodec/dxv: Check remaining bytes in dxv_decompress_raw()
...
Fixes: Timeout
Fixes: 2006/clusterfuzz-testcase-minimized-5766515037044736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit eb50492270 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
90c38d6ab8
avcodec/pafvideo: Check packet size and frame code before ff_reget_buffer()
...
Fixes 1745/clusterfuzz-testcase-minimized-6160693365571584
Fixes: Timeout
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit faa5a2181d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
7edf958740
avcodec/ac3dec_fixed: Fix runtime error: left shift of 419 by 23 places cannot be represented in type 'int'
...
Fixes: 1352/clusterfuzz-testcase-minimized-5757565017260032
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 136ce8baa4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
858adb27a0
avformat/options: log filename on open
...
The loglevel is choosen so that the main filename and any images of
multi image sequences are shown only at debug level to avoid
clutter.
This makes exploits in playlists more visible. As they would show
accesses to private/sensitive files
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 53e0d5d724 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
6a44539bc8
avcodec/aacps: Fix runtime error: left shift of 1073741824 by 1 places cannot be represented in type 'INTFLOAT' (aka 'int')
...
Fixes: 2005/clusterfuzz-testcase-minimized-5744226438479872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9faf098163 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
b7afa9f8aa
avcodec/wavpack: Fix runtime error: shift exponent 32 is too large for 32-bit type 'int'
...
Fixes: 1967/clusterfuzz-testcase-minimized-5757031199801344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8b3e580b7f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
a8643da03a
avcodec/cfhd: Fix runtime error: signed integer overflow: 65280 * 65288 cannot be represented in type 'int'
...
Fixes: 1925/clusterfuzz-testcase-minimized-5564569688735744
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cd6f319a74 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
fe2a92cfd4
avcodec/wavpack: Fix runtime error: signed integer overflow: 2013265955 - -134217694 cannot be represented in type 'int'
...
Fixes: 1922/clusterfuzz-testcase-minimized-5561194112876544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a47273c803 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
1d6983c899
avcodec/cinepak: Check input packet size before frame reallocation
...
Reduces time spend decoding 1917/clusterfuzz-testcase-minimized-5023221273329664
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e47057e932 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
64ecc9eda9
avcodec/hevc_ps: Fix runtime error: signed integer overflow: 2147483628 + 256 cannot be represented in type 'int'
...
Fixes: 1909/clusterfuzz-testcase-minimized-6732072662073344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6726328f79 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
cb14b289bc
avcodec/ra144: Fixes runtime error: signed integer overflow: 7160 * 327138 cannot be represented in type 'int'
...
Fixes: 1908/clusterfuzz-testcase-minimized-5392712477966336
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 08cb69e870 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
ccc598dbcb
avcodec/pnm: Use ff_set_dimensions()
...
Fixes: OOM
Fixes: 1906/clusterfuzz-testcase-minimized-4599315114754048
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a1c0d1d906 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
79a5cac077
avcodec/cavsdec: Fix runtime error: signed integer overflow: 59 + 2147483600 cannot be represented in type 'int'
...
Fixes: 1903/clusterfuzz-testcase-minimized-5359318167715840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 58f8cd4ac5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
5415c88e37
avformat/avidec: Limit formats in gab2 to srt and ass/ssa
...
This prevents part of one exploit leading to an information leak
Found-by: Emil Lerner and Pavel Cheremushkin
Reported-by: Thierry Foucu <tfoucu@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a5d849b149 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:29 +02:00
Michael Niedermayer
625fb08959
avcodec/acelp_pitch_delay: Fix runtime error: value 4.83233e+39 is outside the range of representable values of type 'float'
...
Fixes: 1902/clusterfuzz-testcase-minimized-4762451407011840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 87bddba43b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
d5f5d21322
avcodec/wavpack: Check float_shift
...
Fixes: runtime error: shift exponent 40 is too large for 32-bit type 'unsigned int'
Fixes: 1898/clusterfuzz-testcase-minimized-5970744880136192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4020b009d1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
b424fde5de
avcodec/wavpack: Fix runtime error: signed integer overflow: 24 * -2147483648 cannot be represented in type 'int'
...
Fixes: 1894/clusterfuzz-testcase-minimized-4716739789062144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d90c5bf105 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
df7f051f4d
avcodec/ansi: Fix frame memleak
...
Fixes: 1892/clusterfuzz-testcase-minimized-4519341733183488
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e091b9b3c7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
9f8da7e2aa
avcodec/dds: Fix runtime error: left shift of 145 by 24 places cannot be represented in type 'int'
...
Fixes: 1891/clusterfuzz-testcase-minimized-6274417925554176
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c49fa2a514 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
1d4199e023
avcodec/jpeg2000dec: Use ff_set_dimensions()
...
Fixes: OOM
Fixes: 1890/clusterfuzz-testcase-minimized-6329019509243904
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f3da6fbff8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
ba925988ef
avcodec/truemotion2: Fix passing null pointer to memset()
...
Fixes part of: 1888/clusterfuzz-testcase-minimized-5237704826552320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c901627918 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
362a98eea9
avcodec/truemotion2: Fix runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
...
Fixes part of: 1888/clusterfuzz-testcase-minimized-5237704826552320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c9e884f3d9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
5b6d056da8
avcodec/ra144: Fix runtime error: signed integer overflow: -2449 * 1398101 cannot be represented in type 'int'
...
Fixes: 1885/clusterfuzz-testcase-minimized-5336328549957632
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7c845450d2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
efe4dbb6e6
avcodec/ra144: Fix runtime error: signed integer overflow: 11184810 * 404 cannot be represented in type 'int'
...
Fixes: 1884/clusterfuzz-testcase-minimized-4637425835966464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4c472c5252 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
1b048028a7
avcodec/aac_defines: Add missing () to AAC_HALF_SUM() macro
...
Fixes: runtime error: shift exponent 1073741848 is too large for 32-bit type 'INTFLOAT' (aka 'int')
Fixes: 1880/clusterfuzz-testcase-minimized-4900645322620928
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 872bac8159 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
66c9e5e3eb
avcodec/webp: Fixes null pointer dereference
...
Fixes: 1470/clusterfuzz-testcase-minimized-5404421666111488
Fixes: 1472/clusterfuzz-testcase-minimized-5677426430443520
Fixes: 1875/clusterfuzz-testcase-minimized-5536474562822144
Approved-by: BBB
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 67020711b7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
a871e42e30
avcodec/aacdec_fixed: Fix runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
...
Fixes: 1878/clusterfuzz-testcase-minimized-6441918630199296
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6b9cb5d26a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
b08f7e592f
avcodec/ylc: Check count in build_vlc()
...
Fixes: runtime error: signed integer overflow: 211633430 + 2147483647 cannot be represented in type 'int'
Fixes: 1874/clusterfuzz-testcase-minimized-5037763613163520
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 67b30decf7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
2b220944e9
avcodec/snow: Fix runtime error: signed integer overflow: 1086573993 + 1086573994 cannot be represented in type 'int'
...
Fixes: 1871/clusterfuzz-testcase-minimized-5719950331215872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b9c032ebc0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
ee202d98ce
avcodec/jpeg2000: Fix runtime error: signed integer overflow: 4185 + 2147483394 cannot be represented in type 'int'
...
Fixes: 1870/clusterfuzz-testcase-minimized-4686788029317120
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 781f88bb26 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
f720b43615
avcodec/jpeg2000dec: Check tile offsets more completely
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9c1812491f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
f5839a7826
avcodec/sheervideo: Check input buffer size before allocating and decoding
...
Fixes: Timeout
Fixes: 1858/clusterfuzz-testcase-minimized-6450473802399744
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d8030c14bd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
b1da01c051
avcodec/aacdec_fixed: Fix multiple runtime error: shift exponent 127 is too large for 32-bit type 'int'
...
Fixes: 1851/clusterfuzz-testcase-minimized-5692607495667712
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6c3a63fc3d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
7108189a54
avcodec/wnv1: More strict buffer size check
...
This requires at least 25% of a picture to allocate and decode it
Fixes: Timeout
Fixes: 1845/clusterfuzz-testcase-minimized-5075974343360512
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7f50c25124 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
e18bd51596
avcodec/libfdk-aacdec: Correct buffer_size parameter
...
the timeDataSize argument to aacDecoder_DecodeFrame() seems undocumented and until
2016 04 (203e3f28fbebec7011342017fafc2a0bda0ce530) unused.
after that commit libfdk-aacdec interprets it as size in sample units and memsets that on error.
FFmpeg as well as others (like GStreamer) did interpret it as size in bytes
Fixes: 1442/clusterfuzz-testcase-minimized-4540199973421056 (This requires recent libfdk to reproduce)
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ca6776a993 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
e7776cedf5
avcodec/sbrdsp_template: Fix: runtime error: signed integer overflow: 849815297 + 1315389781 cannot be represented in type 'int'
...
Fixes: 1770/clusterfuzz-testcase-minimized-5285511235108864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7c36ee216f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
6eb1a6f48b
avcodec/ivi_dsp: Fix runtime error: left shift of negative value -2
...
Fixes: 1839/clusterfuzz-testcase-minimized-6238490993885184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 357f2316a0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Kevin Mark
706bbb22b1
doc/filters: Clarify scale2ref example
...
Signed-off-by: Kevin Mark <kmark937@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 114e871621 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
1e74ee34f9
avcodec/mlpdec: Do not leave invalid values in matrix_out_ch[] on error
...
Fixes: runtime error: index 12 out of bounds for type 'uint8_t [8]'
Fixes: 1832/clusterfuzz-testcase-minimized-6574546079449088
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ac8dfcbd89 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
288eb8b17e
avcodec/ra144dec: Fix runtime error: left shift of negative value -17
...
Fixes: 1830/clusterfuzz-testcase-minimized-5828293733384192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 53c0c637d3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:28 +02:00
Michael Niedermayer
9b27474cdf
avformat/mux: Fix copy an paste typo
...
Found-by: Roger Scott <rscott@grammatech.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1a36354698 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
af71771a6c
avutil/internal: Do not enable CHECKED with DEBUG
...
This avoids potential undefined behavior in debug mode while still allowing
developers which want to check for potential additional overflows to do so
by manually enabling this.
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a44b3abb4c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
7072201271
avcodec/aacdec_fixed: Fix runtime error: signed integer overflow: -2147483648 * -1 cannot be represented in type 'int'
...
Fixes: 1825/clusterfuzz-testcase-minimized-6002833050566656
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8e87d146d7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
c419022789
avcodec/smc: Check remaining input
...
Fixes: Timeout
Fixes: 1818/clusterfuzz-testcase-minimized-5039166473633792
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 356194fcb1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
8cbe7461b3
avcodec/diracdec: Fix off by 1 error in quant check
...
Fixes: out of array read
Fixes: 1781/clusterfuzz-testcase-minimized-4617176877105152
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b946bd8ef2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
fdba18c068
avcodec/jpeg2000dec: Fix copy and paste error
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5782e0ba8c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
6b1a01f3ec
avcodec/jpeg2000dec: Check tile offsets
...
Fixes: runtime error: signed integer overflow: 4096 - -2147483648 cannot be represented in type 'int'
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 89325417e7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Max Justicz
66aa3c61fe
avcodec/sanm: Fix uninitialized reference frames
...
Fixes: poc.snm
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ca616b0f72 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
8d7ccdf873
avcodec/jpeglsdec: Check get_bits_left() before decoding a picture
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4bc3008d04 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
3b0f0dab4a
avcodec/ivi_dsp: Fix multiple runtime error: left shift of negative value -71
...
Fixes: 1734/clusterfuzz-testcase-minimized-5385630815092736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8fb00b3e85 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
a7f35b7f35
avcodec/mjpegdec: Fix runtime error: signed integer overflow: -32767 * 130560 cannot be represented in type 'int'
...
Fixes: 1724/clusterfuzz-testcase-minimized-4842395432648704
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 40fa6a2fa2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
43db1288dd
avcodec/aacdec_fixed: Fix runtime error: shift exponent 34 is too large for 32-bit type 'int'
...
Fixes: 1721/clusterfuzz-testcase-minimized-4719352135811072
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b5228e44c7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
510f968849
avcodec/mpeg4videodec: Check for multiple VOL headers
...
Fixes multiple: runtime error: signed integer overflow: 2147115008 + 413696 cannot be represented in type 'int'
Fixes: 1723/clusterfuzz-testcase-minimized-5309409372667904
Fixes: 1727/clusterfuzz-testcase-minimized-5900685306494976
Fixes: 1737/clusterfuzz-testcase-minimized-5922321338466304
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit efeb47fd5d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
eed9fc2f61
avcodec/vmnc: Check location before use
...
Fixes: runtime error: signed integer overflow: 65535 * 64256 cannot be represented in type 'int'
Fixes: 1717/clusterfuzz-testcase-minimized-5491696676634624
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ec2b76aab4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
228b1e3f40
avcodec/takdec: Fix runtime error: signed integer overflow: 8192 * 524308 cannot be represented in type 'int'
...
Fixes: 1630/clusterfuzz-testcase-minimized-6326111917047808
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 955db41192 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
bc95cd1480
avcodec/aac_defines: Fix: runtime error: left shift of negative value -2
...
Fixes: 1716/clusterfuzz-testcase-minimized-4691012196761600
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c3547dcbc3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
20363bef60
avcodec/takdec: Fix runtime error: left shift of negative value -63
...
Fixes: 1713/clusterfuzz-testcase-minimized-5791887476654080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d66193252b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
e1e7b75cbf
avcodec/mlpdsp: Fix runtime error: signed integer overflow: -24419392 * 128 cannot be represented in type 'int'
...
Fixes: 1711/clusterfuzz-testcase-minimized-5248503515185152
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1d04fc94e1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
90ff230fd1
avcodec/sbrdsp_fixed: fix runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
...
Fixes: part of 1709/clusterfuzz-testcase-minimized-4513580554649600
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 384508b2ff )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
f5212833b2
avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 170 is too large for 32-bit type 'int'
...
Fixes part of 1709/clusterfuzz-testcase-minimized-4513580554649600
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6310fc714d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
1d52ed4da8
avcodec/mlpdec: Do not leave a invalid num_primitive_matrices in the context
...
Fixes: runtime error: index 8 out of bounds for type 'uint8_t [8]'
Fixes: 1699/clusterfuzz-testcase-minimized-6327177438035968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 64ea4d102a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
0ff8f9b8e0
avcodec/aacsbr_fixed: Fix multiple runtime error: shift exponent 150 is too large for 32-bit type 'int'
...
Fixes: 1681/clusterfuzz-testcase-minimized-5970545365483520
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3fb104f447 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
bc133fe409
avcodec/mimic: Use ff_set_dimensions() to set the dimensions
...
Fixes: OOM
Fixes: 1671/clusterfuzz-testcase-minimized-4759078033162240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e434840fd4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
4f40dac0af
avcodec/fic: Fix multiple runtime error: signed integer overflow: 5793 * 419752 cannot be represented in type 'int'
...
Fixes: 1669/clusterfuzz-testcase-minimized-5287529198649344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a173f484b5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
6ee9d6e32f
avcodec/mlpdec: Fix: runtime error: left shift of negative value -8
...
Fixes: 1658/clusterfuzz-testcase-minimized-4889937130291200
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 25c81e4b73 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
70247373a1
avcodec/dfa: Fix: runtime error: signed integer overflow: -14202 * 196877 cannot be represented in type 'int'
...
Fixes: 1657/clusterfuzz-testcase-minimized-4710000079405056
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 58ac7fb9c3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
dd01941b9a
avcodec/aacdec: Fix runtime error: signed integer overflow: 2147483520 + 255 cannot be represented in type 'int'
...
Fixes: 1656/clusterfuzz-testcase-minimized-5900404925661184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 94d05ff159 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
f66f1c5232
avcodec/aacdec_template: Fix fixed point scale in decode_cce()
...
Fixes: runtime error: shift exponent 1073741824 is too large for 32-bit type 'int'
Fixes: 1654/clusterfuzz-testcase-minimized-5151903795118080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 53a502206a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:27 +02:00
Michael Niedermayer
3814f965aa
avcodec/flicvideo: Check frame_size before decrementing
...
Fixes: runtime error: signed integer overflow: -2147483627 - 22 cannot be represented in type 'int'
Fixes: 1637/clusterfuzz-testcase-minimized-5376582493405184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 355e27e24d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:26 +02:00
Michael Niedermayer
e74ec43293
avcodec/mlpdec: Fix runtime error: left shift of negative value -1
...
Fixes: 1636/clusterfuzz-testcase-minimized-5310494757879808
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 552adf1dd3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:26 +02:00
Michael Niedermayer
b4bb262b48
avcodec/takdec: Fix runtime error: left shift of negative value -42
...
Fixes: 1635/clusterfuzz-testcase-minimized-4992749856096256
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 99c4c76cfb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:26 +02:00
Michael Niedermayer
a9bb748cee
avcodec/hq_hqa: Fix: runtime error: signed integer overflow: -255 * 10180917 cannot be represented in type 'int'
...
Fixes: 1626/clusterfuzz-testcase-minimized-6416580571299840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3d9cb583c8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-06-16 01:05:26 +02:00
Timo Rothenpieler
1f76235dd4
avcodec/nvenc: remove unnecessary alignment
...
Fixes #6260
2017-05-23 11:59:21 +02:00
Aaron Levinson
7793fc5b33
avutil/hwcontext_dxva2: Don't improperly free IDirect3DSurface9 objects
...
Add dxva2_pool_release_dummy() and use it in call to
av_buffer_create() in dxva2_pool_alloc().
Prior to this change, av_buffer_create() was called with NULL for the
third argument, which indicates that av_buffer_default_free() should
be used to free the buffer's data. Eventually, it gets to
buffer_pool_free() and calls buf->free() on a surface object (which is
av_buffer_default_free()).
This can result in a crash when the debug version of the C-runtime is
used on Windows. While it doesn't appear to result in a crash when
the release version of the C-runtime is used on Windows, it likely
results in memory corruption, since av_free() is being called on
memory that was allocated using
IDirectXVideoAccelerationService::CreateSurface().
Signed-off-by: Aaron Levinson <alevinsn@aracnet.com >
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Reviewed-by: Mark Thompson <sw@jkqxz.net >
(cherry picked from commit 0c1c514643 )
2017-05-16 22:03:21 +01:00
James Almer
e958bfac8b
avcodec/hevc_sei: fix amount of bits skipped when reading picture timing SEI message
...
The code was skipping the entire reported SEI message size regardless of
the amount of bits read.
While in theory safe for NALU where the picture timing SEI message is alone
or at the end as we're using the checked bitstream reader, it isn't in any
other situation, where every SEI message in the NALU after the picture
timing one would potentially fail to parse.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit f738140807 )
Conflicts:
libavcodec/hevc_sei.c
2017-05-16 14:09:01 -03:00
James Almer
d4241affd8
avcodec/aac_adtstoasc: fix ASC passthrough on small frames
...
ASC frames smaller than AAC_ADTS_HEADER_SIZE were being discarded.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 0f05f2c7e6 )
2017-05-16 11:58:23 -03:00
Gregory J. Wolfe
5d737a3d0c
avformat/tests/fifo_muxer: includes libavformat/network.h to define ETIMEDOUT for fate build.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9c041a3cd5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-16 04:00:30 +02:00
Michael Niedermayer
f61c888743
Update for FFmpeg 3.2.5
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-16 03:34:43 +02:00
Michael Niedermayer
1274e92015
avcodec/truemotion1: Fix multiple runtime error: signed integer overflow: 1246906962 * 2 cannot be represented in type 'int'
...
Fixes: 1616/clusterfuzz-testcase-minimized-5119196578971648
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5ea6bc2a166edac37042f2bbc28eb603a0fbeccb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-16 03:30:40 +02:00
Michael Niedermayer
8e6d9d48a0
avcodec/svq3: Fix runtime error: left shift of negative value -6
...
Fixes: 1604/clusterfuzz-testcase-minimized-5312060206350336
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a6eb006ad4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-16 02:24:34 +02:00
Michael Niedermayer
c521f9a5cd
avcodec/tiff: reset sampling[] if its invalid
...
Fixes divission by 0
Fixes: clusterfuzz-testcase-minimized-5592896440893440
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f08122fbe0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-16 02:24:01 +02:00
Michael Niedermayer
826515083a
avcodec/aacps: Fix undefined behavior
...
Fixes: 1337/clusterfuzz-testcase-minimized-5212314171080704
Fixes the existence of a potentially invalid pointer intermediate
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 527f89e059 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:52:43 +02:00
Michael Niedermayer
0f5cb5c111
avcodec/opus_silk: Fix integer overflow and out of array read
...
Fixes: 1362/clusterfuzz-testcase-minimized-6097275002552320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4654baff12 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:52:03 +02:00
Michael Niedermayer
6131115d27
avcodec/flacdec: Return error code instead of 0 for failures
...
Fixes: infinite loop
Fixes: 1418/clusterfuzz-testcase-minimized-5934472438480896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3f5a68533d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:50:21 +02:00
Michael Niedermayer
3078fc9de7
avcodec/snowdec: Check width
...
Fixes: out of array read
Fixes: 1419/clusterfuzz-testcase-minimized-6108700873850880
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 78aa93807b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:49:03 +02:00
Michael Niedermayer
5d7b87af7e
avcodec/webp: Update canvas size in vp8_lossy_decode_frame() as in vp8_lossless_decode_frame()
...
Fixes: 1407/clusterfuzz-testcase-minimized-6044604124102656
Fixes: 1420/clusterfuzz-testcase-minimized-6059927359455232
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 72810d20b7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:48:29 +02:00
Michael Niedermayer
2384c67d06
avcodec/webp: Factor update_canvas_size() out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c4f63b78b7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:34:17 +02:00
Michael Niedermayer
d835d6cd08
avcodec/cllc: Check prefix
...
Fixes: runtime error: left shift of 1610706944 by 1 places cannot be represented in type 'int'
Fixes: 1421/clusterfuzz-testcase-minimized-6239947507892224
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 62c5949bec )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:32:51 +02:00
Michael Niedermayer
3c428a5ff7
avcodec/rscc: Check pixel_size for overflow
...
Fixes: 1509/clusterfuzz-testcase-minimized-5129419876204544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 934572c5c3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:28:25 +02:00
Michael Niedermayer
9b76264241
avcodec/dds: Fix runtime error: left shift of 210 by 24 places cannot be represented in type 'int'
...
Fixes: 1510/clusterfuzz-testcase-minimized-5826231746428928
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit afb4632cc3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:27:52 +02:00
Michael Niedermayer
36847fd7f1
avcodec/mpeg4videodec: Clear sprite wraping on unsupported cases in VOP decode
...
Fixes: Integer overflow
Fixes: 1572/clusterfuzz-testcase-minimized-4578773729017856
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 467677769a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 17:24:57 +02:00
Michael Niedermayer
322077091c
avcodec/ac3dec: Fix: runtime error: index -1 out of bounds for type 'INTFLOAT [2]'
...
It seems dual mono with a LFE channel is not forbidden
Fixes: 1570/clusterfuzz-testcase-minimized-6455337349545984
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c55e637072 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 15:31:43 +02:00
Michael Niedermayer
d736890eed
avcodec/hqxdsp: Fix runtime error: signed integer overflow: -196264 * 11585 cannot be represented in type 'int'
...
Fixes: 1568/clusterfuzz-testcase-minimized-5944868608147456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b923213276 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 15:31:26 +02:00
Michael Niedermayer
08a4305128
avcodec/g723_1dec: Fix LCG type
...
Fixes: 1567/clusterfuzz-testcase-minimized-5693653555085312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f2c539d350 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 15:31:17 +02:00
Michael Niedermayer
45a0a449bd
libswscale/tests/swscale: Fix uninitialized variables
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7796f29065 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
82bcbad1fd
avcodec/ffv1dec: Fix runtime error: signed integer overflow: 1550964438 + 1550964438 cannot be represented in type 'int'
...
Fixes: 1559/clusterfuzz-testcase-minimized-5048096079740928
Fixes: 1560/clusterfuzz-testcase-minimized-6011037813833728
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8630b2cd36 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
79bfa4a663
avcodec/webp: Fix signedness in prefix_code check
...
Fixes: out of array read
Fixes: 1557/clusterfuzz-testcase-minimized-6535013757616128
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8c5cd1c9d3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
ea57abac8d
avcodec/svq3: Fix runtime error: signed integer overflow: 169 * 12717677 cannot be represented in type 'int'
...
Fixes: 1556/clusterfuzz-testcase-minimized-5027865978470400
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 86b1b0d33d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
2366285207
avcodec/mlpdec: Check that there is enough data for headers
...
Fixes: out of array access
Fixes: 1541/clusterfuzz-testcase-minimized-6403410590957568
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e3e51f8c14 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
85d5f5502c
avcodec/ac3dec: Keep track of band structure
...
It is needed in some corner cases that seem not to be forbidden
Fixes: out of array index
Fixes: 1538/clusterfuzz-testcase-minimized-4696904925446144
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9351a156de )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
7ed2d4dcb7
avcodec/webp: Add missing input padding
...
Fixes: 1536/clusterfuzz-testcase-minimized-5973925404082176
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a3508cc3fe )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
95ccad6758
avcodec/aacdec_fixed: Fix runtime error: left shift of negative value -1
...
Fixes: 1535/clusterfuzz-testcase-minimized-5826695535788032
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 26227d9186 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
4d47113c66
avcodec/aacsbr_template: Do not change bs_num_env before its checked
...
Fixes: 1489/clusterfuzz-testcase-minimized-5075102901207040
Fixes: out of array access
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 87b08ee6d2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
39a24c1fa8
avcodec/mlp: Fix multiple runtime error: left shift of negative value -1
...
Fixes: 1512/clusterfuzz-testcase-minimized-4713846423945216
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 74dc728a2c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
5983ae55ec
avcodec/vp8dsp: vp7_luma_dc_wht_c: Fix multiple runtime error: signed integer overflow: -1366381240 + -1262413604 cannot be represented in type 'int'
...
Fixes: 1440/clusterfuzz-testcase-minimized-5785716111966208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ccce2248bf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
9c6577035e
avcodec/avcodec: Limit the number of side data elements per packet
...
Fixes: 1293/clusterfuzz-testcase-minimized-6054752074858496
See: [FFmpeg-devel] [PATCH] avcodec/avcodec: Limit the number of side data elements per packet
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d5711cb891 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
7d37865af0
avcodec/texturedsp: Fix runtime error: left shift of 255 by 24 places cannot be represented in type 'int'
...
Fixes: 1505/clusterfuzz-testcase-minimized-4561688818876416
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f225003d17 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
bec98cd8bd
avcodec/g723_1dec: Fix runtime error: left shift of negative value -1
...
Fixes: 1504/clusterfuzz-testcase-minimized-6249212138225664
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c4c0245686 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
2964778d7e
avcodec/wmv2dsp: Fix runtime error: signed integer overflow: 181 * -17047030 cannot be represented in type 'int'
...
Fixes: 1503/clusterfuzz-testcase-minimized-5369271855087616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit df640dbbc9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
a1a7dd4da0
avcodec/diracdec: Fix Assertion frame->buf[0] failed at libavcodec/decode.c:610
...
Fixes: 1487/clusterfuzz-testcase-minimized-6288036495097856
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6899e6e560 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
54eaad7c6e
avcodec/msmpeg4dec: Check for cbpy VLC errors
...
Fixes: runtime error: left shift of negative value -1
Fixes: 1480/clusterfuzz-testcase-minimized-5188321007370240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 15e892aad1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
af52a28f4d
avcodec/cllc: Check num_bits
...
Fixes: runtime error: shift exponent -2 is negative
Fixes: 1479/clusterfuzz-testcase-minimized-6638493360979968
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2bfd0a9758 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
0a75880b64
avcodec/cllc: Factor VLC_BITS/DEPTH out, do not use repeated literal numbers
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e717fa1f0a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
b83e839f1e
avcodec/dvbsubdec: Check entry_id
...
Fixes: randomly writing over the array end
Fixes: 1473/clusterfuzz-testcase-minimized-5768907824562176
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8a69f2602f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
b36be353b8
avcodec/aacdec_fixed: Fix multiple shift exponent 33 is too large for 32-bit type 'int'
...
Fixes: 1471/clusterfuzz-testcase-minimized-6376460543590400
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3a0ff78168 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
8bdef54c19
avcodec/mpeg12dec: Fixes runtime error: division by zero
...
Fixes: 1464/clusterfuzz-testcase-minimized-4925445571084288
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c0ece1f4ad )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
869e8b1d0f
avcodec/webp: Always set pix_fmt
...
Fixes: out of array access
Fixes: 1434/clusterfuzz-testcase-minimized-6314998085189632
Fixes: 1435/clusterfuzz-testcase-minimized-6483783723253760
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6b5d3fb26f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
fa3bbd77c1
avfilter/vf_uspp: Fix currently unused input frame dimensions
...
Found-by: Nicolas
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 942036e97c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
89a2384828
avcodec/truemotion1: Fix multiple runtime error: left shift of negative value -1
...
Fixes: 1446/clusterfuzz-testcase-minimized-5577409124368384
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit db5fae3229 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
d757c9428c
avcodec/eatqi: Fix runtime error: signed integer overflow: 4466147 * 1075 cannot be represented in type 'int'
...
Fixes: 1443/clusterfuzz-testcase-minimized-4826998612426752
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a8de60ba27 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
d6c2b08e73
avcodec/dss_sp: Fix runtime error: signed integer overflow: 2147481189 + 4096 cannot be represented in type 'int'
...
Fixes: 1441/clusterfuzz-testcase-minimized-6223152357048320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6ea4287893 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
李赞
a4fb44723d
avformat/wavdec: Check chunk_size
...
Fixes integer overflow and out of array access
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3d23219637 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
25a592e5d4
avcodec/cavs: Check updated MV
...
Fixes: runtime error: signed integer overflow: 251 + 2147483647 cannot be represented in type 'int'
Fixes: 1438/clusterfuzz-testcase-minimized-4917542646710272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5871adc90f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
3c8e14482e
avcodec/y41pdec: Fix width in input buffer size check
...
Fixes: out of array read
Fixes: 1437/clusterfuzz-testcase-minimized-4569970002362368
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3d8d372947 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
dcc5cdbdbb
avcodec/svq3: Fix multiple runtime error: signed integer overflow: -237341 * 24552 cannot be represented in type 'int'
...
Fixes: 1429/clusterfuzz-testcase-minimized-5959951610544128
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ae6fd1790f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
f01e5156df
avcodec/texturedsp: Fix runtime error: left shift of 218 by 24 places cannot be represented in type 'int'
...
Fixes: 1428/clusterfuzz-testcase-minimized-5263281793007616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2bd8eb05d2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
d47a3f3f9d
avcodec/lagarith: Check scale_factor
...
Fixes: 1425/clusterfuzz-testcase-minimized-6295712339853312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ed3c9b5b0d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
7810d341d3
avcodec/lagarith: Fix runtime error: left shift of negative value -1
...
Fixes: 1424/clusterfuzz-testcase-minimized-6088327159611392
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ddb2dd7edb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
477020fdf1
avcodec/takdec: Fix multiple runtime error: left shift of negative value -1
...
Fixes: 1423/clusterfuzz-testcase-minimized-5063889899225088
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c5d2fa2fdf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
ebbf9e1eb8
avcodec/indeo2: Check for invalid VLCs
...
Fixes: timeout
Fixes: 1416/clusterfuzz-testcase-minimized-5536862435278848
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 159fb8ff7e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
1219924dbe
avcodec/g723_1dec: Fix several integer related cases of undefined behaviour
...
Fixes: 1412/clusterfuzz-testcase-minimized-6561308772139008
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d3088e0fd8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
350f7f0bdf
avcodec/htmlsubtitles: Check for string truncation and return error
...
Fixes out of array access
Fixes: 1354/clusterfuzz-testcase-minimized-5520132195483648
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f4ae3cce64 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
f47b687067
avcodec/bmvvideo: Fix runtime error: left shift of 137 by 24 places cannot be represented in type 'int'
...
Fixes: 1411/clusterfuzz-testcase-minimized-5776085184675840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 29692023b2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
14da95af46
avcodec/dss_sp: Fix multiple runtime error: signed integer overflow: -15699 * -164039 cannot be represented in type 'int'
...
Fixed: 1409/clusterfuzz-testcase-minimized-5237365020819456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ea59ef0c03 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
afa243bdf0
avcodec/dvbsubdec: check region dimensions
...
Fixes: 1408/clusterfuzz-testcase-minimized-6529985844084736
Fixes: integer overflow
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0075d9eced )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
05efc2bab7
avcodec/vp8dsp: Fixes: runtime error: signed integer overflow: 1330143360 - -1023040530 cannot be represented in type 'int'
...
Fixes: 1406/clusterfuzz-testcase-minimized-5064865125236736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8824b7370a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
f06fae660b
avcodec/hqxdsp: Fix multiple runtime error: signed integer overflow: 248220 * 21407 cannot be represented in type 'int' in idct_col()
...
Fixes: 1405/clusterfuzz-testcase-minimized-5011491835084800
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5d5118f81b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
862b16aabf
avcodec/cavsdec: Check sym_factor
...
Fixes: runtime error: signed integer overflow: 25984 * 130560 cannot be represented in type 'int'
Fixes: 1404/clusterfuzz-testcase-minimized-5000441286885376
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 279420b5a6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
7f3a671ece
avcodec/cdxl: Check format for BGR24
...
Fixes: out of array access
Fixes: 1427/clusterfuzz-testcase-minimized-5020737339392000
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1e42736b95 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
4aea3cd974
avcodec/ffv1dec: Fix copying planes of paletted formats
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3a4d387195 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
ed06434bff
avcodec/wmv2dsp: Fix runtime error: signed integer overflow: 181 * -12156865 cannot be represented in type 'int'
...
Fixes: 1401/clusterfuzz-testcase-minimized-6526248148795392
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8b1f66cf5c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
85c8c0c826
avcodec/xwddec: Check bpp more completely
...
Fixes out of array access
Fixes: 1399/clusterfuzz-testcase-minimized-4866094172995584
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 441026fcb1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
332a9cbbf7
avcodec/aacdec_template: Do not decode 2nd PCE if it will lead to failure
...
Fixes: out of array read
Fixes: 1072/clusterfuzz-testcase-6456688074817536
Fixes: 1398/clusterfuzz-testcase-minimized-4576913622302720
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a5e0dbf530 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
36dd76ef14
avcodec/s302m: Fix left shift of 8 by 28 places cannot be represented in type 'int'
...
Fixes: 1395/clusterfuzz-testcase-minimized-5330939741732864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a38e9797cb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:16 +02:00
Michael Niedermayer
e9a8242b96
avcodec/eamad: Fix runtime error: signed integer overflow: 49674 * 49858 cannot be represented in type 'int'
...
Fixes: 1394/clusterfuzz-testcase-minimized-6493376885030912
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0ac1c87194 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
408b4fb430
avcodec/g726: Fix runtime error: left shift of negative value -2
...
Fixes: 1393/clusterfuzz-testcase-minimized-5948366791901184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c04aa14882 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
fe09596f49
avcodec/ra144: Fix runtime error: left shift of negative value -798
...
Fixes: 1388/clusterfuzz-testcase-minimized-6680800936329216
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 78bf446852 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8d17000794
avcodec/mss34dsp: Fix multiple signed integer overflow
...
Fixes: 1387/clusterfuzz-testcase-minimized-4802757766676480
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 464c4b86ee )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
5c81cf8225
avcodec/targa_y216dec: Fix width type
...
Fixes out of array access
Fixes: 1376/clusterfuzz-testcase-minimized-6361794975105024
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3e56db8926 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
a7ca51b273
avcodec/texturedsp: Fix multiple runtime error: left shift of 255 by 24 places cannot be represented in type 'int'
...
Fixes: 1386/clusterfuzz-testcase-minimized-5323086394032128
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e92fb2bea1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
1514e432f9
avcodec/ivi_dsp: Fix multiple left shift of negative value -2
...
Fixes: 1385/clusterfuzz-testcase-minimized-5552882663292928
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9e88cc94e5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
a3e3d72d12
avcodec/svq3: Fix multiple runtime error: signed integer overflow: 44161 * 61694 cannot be represented in type 'int'
...
Fixes: 1382/clusterfuzz-testcase-minimized-6013445293998080
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 669419939c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
89e26447fa
avcodec/msmpeg4dec: Correct table depth
...
Fixes undefined shift
Fixes: 1381/clusterfuzz-testcase-minimized-5513944540119040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1121d92707 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
207f2874c0
avcodec/dds: Fix runtime error: left shift of 1 by 31 places cannot be represented in type 'int'
...
Fixes: 1380/clusterfuzz-testcase-minimized-650122545122508
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8a8335de03 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
7a69c1b2ab
avcodec/cdxl: Check format parameter
...
Fixes out of array access
Fixes: 1378/clusterfuzz-testcase-minimized-5715088008806400
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e1b60aad77 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
1bb1d2d4a1
avutil/softfloat: Fix overflow in av_div_sf()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 277e397eb5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
f20c485e4e
avcodec/hq_hqa: Fix runtime error: left shift of negative value -207
...
Fixes: 1375/clusterfuzz-testcase-minimized-6070134701555712
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1283c42447 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
db83541205
avcodec/mss3: Change types in rac_get_model_sym() to match the types they are initialized from
...
Fixes integer overflow
Fixes: 1372/clusterfuzz-testcase-minimized-5712192982745088
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2ef0f39271 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8bf18194ab
avcodec/shorten: Check k in get_uint()
...
Fixes: undefined shift
Fixes: 1371/clusterfuzz-testcase-minimized-5770822591447040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7b6a51f59c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
57e603fd9f
avcodec/webp: Fix null pointer dereference
...
Fixes: 1369/clusterfuzz-testcase-minimized-5048908029886464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9bf4523e40 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
65f3fffbcf
avcodec/dfa: Fix signed integer overflow: -2147483648 - 1 cannot be represented in type 'int'
...
Fixes: 1368/clusterfuzz-testcase-minimized-4507293276176384
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 12936a4585 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
37d51c242f
avcodec/g723_1: Fix multiple runtime error: left shift of negative value
...
Fixes: 1367/clusterfuzz-testcase-minimized-571496882346393
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4ace2d2219 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
054a16d375
avcodec/mimic: Fix runtime error: left shift of negative value -1
...
Fixes: 1365/clusterfuzz-testcase-minimized-5624158450876416
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fc2c420b82 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
aa39ca14d6
avcodec/fic: Fix multiple left shift of negative value -15
...
Fixes: 1356/clusterfuzz-testcase-minimized-6008489086287872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b20c71409b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
4ee1e00f08
avcodec/mlpdec: Fix runtime error: left shift of negative value -22
...
Fixes: 1355/clusterfuzz-testcase-minimized-6662205472768000
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c535436cbe )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
2d3da218ce
avcodec/snowdec: Check qbias
...
Fixes: signed integer overflow: -1094995529 * 131 cannot be represented in type 'int'
Fixes: 1353/clusterfuzz-testcase-minimized-5208180449607680
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 523205ce1e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
cff78c4cc4
avutil/softfloat: Fix multiple runtime error: left shift of negative value -8
...
Fixes: 1352/clusterfuzz-testcase-minimized-5757565017260032
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 35f3df0d76 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
2a6cad221b
avcodec/aacsbr_template: Do not leave bs_num_env invalid
...
Fixes out of array read
Fixes: 1349/clusterfuzz-testcase-minimized-5370707196248064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a8ad83b793 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
1f91d66a62
avcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be represented in type 'int'
...
Fixes: 1346/clusterfuzz-testcase-minimized-5776732600664064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a234b5ade3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
536af42121
avcodec/dfa: Fix off by 1 error
...
Fixes out of array access
Fixes: 1345/clusterfuzz-testcase-minimized-6062963045695488
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f52fbf4f3e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
9c7184ae63
avcodec/nellymoser: Fix multiple left shift of negative value -8591
...
Fixes: 1342/clusterfuzz-testcase-minimized-5490842129137664
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0953736b7e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
0f6f163922
avcodec/cdxl: Fix signed integer overflow: 14243456 * 164 cannot be represented in type 'int'
...
Fixes: 1341/clusterfuzz-testcase-minimized-5441502618583040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1002932a3b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
db8f28fd3f
avcodec/g722: Fix multiple runtime error: left shift of negative value -1
...
Fixes: 1340/clusterfuzz-testcase-minimized-4669892148068352
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f55df62998 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
77aa9eddbc
avcodec/dss_sp: Fix multiple left shift of negative value -466
...
Fixes: 1339/clusterfuzz-testcase-minimized-4614671485108224
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 38152d9368 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
5fb14cc889
avcodec/wnv1: Fix runtime error: left shift of negative value -1
...
Fixes: 1338/clusterfuzz-testcase-minimized-6485546354343936
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9fac508ca4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
a78cfe84f9
avcodec/tiertexseqv: set the fixed dimenasions, do not depend on the demuxer doing so
...
Fixes: out of array access
Fixes: 1348/clusterfuzz-testcase-minimized-6195673642827776
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ce551a3925 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
b0d6bff2f2
avcodec/mjpegdec: Fix runtime error: signed integer overflow: -24543 * 2031616 cannot be represented in type 'int'
...
Fixes: 943/clusterfuzz-testcase-5114865297391616
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a78ae465fd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
231e242ed2
avcodec/cavsdec: Fix undefined behavior from integer overflow
...
Fixes: 1335/clusterfuzz-testcase-minimized-5566961566089216
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a0e5f7f363 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
58b05f8720
avcodec/dvdsubdec: Fix runtime error: left shift of 242 by 24 places cannot be represented in type 'int'
...
Fixes: 1080/clusterfuzz-testcase-5353236754071552
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ce7098b8f2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
5aa97eb1a6
libavcodec/mpeg4videodec: Convert sprite_offset to 64bit
...
This avoids intermediates from overflowing (the final values are checked)
Fixes: runtime error: signed integer overflow: -167712 + -2147352576 cannot be represented in type 'int'
Fixes: 1298/clusterfuzz-testcase-minimized-5955580877340672
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c1c3a14073 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
6bdc6bef2a
avcodec/pngdec: Use ff_set_dimensions()
...
Fixes OOM
Fixes: 1314/clusterfuzz-testcase-minimized-4621997222920192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a0296fc056 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
03dee014f4
avcodec/msvideo1: Check buffer size before re-getting the frame
...
Fixes timeout
Fixes: 1306/clusterfuzz-testcase-minimized-6152296217968640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cabfed6895 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
56f8ab1802
avcodec/h264_cavlc: Fix undefined behavior on qscale overflow
...
Fixes: 1214/clusterfuzz-testcase-minimized-6130606599569408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fc8cff96ed )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
4674c4594f
avcodec/dcadsp: Fix runtime error: signed integer overflow
...
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9244b839b7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
f66140a1bd
avcodec/svq3: Reject dx/dy beyond 16bit
...
The code does use 16bit sized arrays later so larger deltas would not work
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 48b3117844 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
fa595a94a1
avcodec/svq3: Increase offsets to prevent integer overflows
...
Fixes: 1280/clusterfuzz-testcase-minimized-6102353767825408
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 382b4fc9b5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8fee7589d5
avcodec/indeo2: Check remaining bits in ir2_decode_plane()
...
Fixes: 1290/clusterfuzz-testcase-minimized-5815578902134784
Fixes: timeout
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b29feec982 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
bd2e3b0e90
avcodec/vp3: Check remaining bits in unpack_dct_coeffs()
...
Decreases the time spend decoding junk.
May fix: 1283/clusterfuzz-testcase-minimized-6221126759874560
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2f00300b77 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
9f2b473fa7
doc/developer: Add terse documentation of assumed C implementation defined behavior
...
Suggested-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b706ddbae3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
50cd472ce6
avcodec/mdec: Fix runtime error: left shift of negative value -127
...
Fixes undefined behavior
Fixes: 1275/clusterfuzz-testcase-minimized-6718162017976320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6ca82975b7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8fb0b9ae35
avcodec/x86/vc1dsp_init: Fix build failure with --disable-optimizations and clang
...
compilers doing DCE at -O0 do not necessarily understand "complex" boolean expressions
Build succeeds with this change, this was the only failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fa8fd0808f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Martin Vignali
0ed8bab02f
libavcodec/exr : fix float to uint16 conversion for negative float value
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e46d637452 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Derek Buitenhuis
e66548345c
avformat/webmdashenc: Validate the 'streams' adaptation sets parameter
...
It should not be a value larger than the number of streams we have,
or it will cause invalid reads and/or SIGSEGV.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ec07efa700 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Derek Buitenhuis
1485562f6e
avformat/webmdashenc: Require the 'adaptation_sets' option to be set
...
This seems to be non-optional, and if the muxer is run without it,
strlen() is run on NULL, causing a segfault.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cbd3a68f3e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
bb61a31223
avformat/oggparseogm: Check ff_alloc_extradata() for failure
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9eff4b0d2b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
773c55b820
avformat/oggparseogm: Check available data before reading global header
...
Fixes use of uninitialized data
Found-by: Thomas Guilbert <tguilbert@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 170d864d2c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
502313dd50
avformat/mov: Check creation_time for overflow
...
Fixes integer overflow
Fixes: 701640
Found-by: Found-by: Thomas Guilbert <tguilbert@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 39ee3ddff8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
0a6598536c
avcodec/dvdsubdec: Fixes 2 runtime error: left shift of 170 by 24 places cannot be represented in type 'int'
...
Fixes: 619/clusterfuzz-testcase-5803914534322176
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 61ee2ca775 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
7655f73c45
avcodec/h264: Check weight values to be within the specs limits.
...
Fixes: integer overflows
Fixes: 911/clusterfuzz-testcase-5415105606975488
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 08117a4015 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Thierry Foucu
2d0c589941
libavformat/mov: Fix memory leak, need to free the chapter tracks array
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ac24a8202a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
30f20c0b93
avformat/oggparsedaala: Do not leave an invalid value in gpshift
...
Fixes: undefined behavior
Fixes: 702974
Found-by: Thomas Guilbert <tguilbert@google.com >
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 23ae3cc822 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
5e8786fc22
avformat/oggparsedaala: Check duration for AV_NOPTS_VALUE
...
This avoids an integer overflow
the solution matches oggparsevorbis.c and 45581ed15d
Fixes: 700242
Found-by: Thomas Guilbert <tguilbert@google.com >
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 679a315424 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
a17d258e94
avformat/libopenmpt: Check for avio_size() failure
...
Fixes CID1396850
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bd8201566d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8ce5038e99
avfilter/af_sofalizer: Fix bad shift
...
Fixes CID1396835
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4064f3f0df )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
wm4
4ed0177e4a
avcodec: fix uninitialized variable read
...
This cna happen if the user tries to call the new decode API for
subtitles.
Fixes CID 1402071.
(cherry picked from commit b4b8ca24f6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
a99a7bb071
avfilter/avfiltergraph: Add assert to write down in machine readable form what is assumed about sample rates in swap_samplerates_on_filter()
...
Fixes CID1397292
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5f2b360fc0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
4dcceb650d
avcodec/tiff: Perform multiply in tiff_unpack_lzma() as 64bit
...
This should make no difference as the value should not be able to be that large
but its more correct this way
Fixes CID1348138
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f48b6b8b91 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Steven Liu
7129dfdba8
avformat/test/fifo_muxer: add check for FailingMuxerPacketData alloc
...
CID: 1396257
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Steven Liu <lq@chinaffmpeg.org >
(cherry picked from commit d1f3e475f9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Timothy Gu
efc708afae
omx: Fix OOM check
...
Also use av_mallocz_array().
Fixes CID1396839.
(cherry picked from commit 16a75304fe )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Philip Langdale
d4f4fa22d7
avcodec/vdpau_hevc: Fix potential out-of-bounds write
...
The maximum number of references is 16, so the index value cannot
exceed 15.
Fixes Coverity CID 1348139, 1348140, 1348141
(cherry picked from commit 4e6d1c1f4e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8ee3f73464
avcodec/h264_ps: Fix runtime error: signed integer overflow: 2147483647 + 26 cannot be represented in type 'int'
...
Fixes: 902/clusterfuzz-testcase-4561155144024064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4f727fbc73 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
fc863900b7
avcodec/tiff: Check geotag count for being non zero
...
Fixes memleak
Fixes: 874/clusterfuzz-testcase-5252796175613952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3182e19c1c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
6f0a892ba0
avcodec/vp56: Check avctx->error_concealment before enabling EC
...
Fixes timeout with 847/clusterfuzz-testcase-5291877358108672
Fixes timeout with 850/clusterfuzz-testcase-5721296509861888
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 98da63b3f5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
a7ccd87090
avcodec/tiff: Check stripsize strippos for overflow
...
Fixes: 861/clusterfuzz-testcase-5688284384591872
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5d996b5649 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
6652799267
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 >
(cherry picked from commit 8ebed703f1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
6ee76fab4c
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 >
(cherry picked from commit 108b02e547 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
81ea01fb1c
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 >
(cherry picked from commit 7cebc5a9cc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
b0c5fff859
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 >
(cherry picked from commit a66c6e28b5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8eadc50021
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 >
(cherry picked from commit 44e2105189 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
f03bab0240
avcodec/mpeg4videodec: Fix runtime error: signed integer overflow: -135088512 * 16 cannot be represented in type 'int'
...
Fixes: 736/clusterfuzz-testcase-5580263943831552
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e2a4f1a9eb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
7c349ae7e9
avcodec/h264_mvpred: Fix runtime error: left shift of negative value -1
...
Fixes: 734/clusterfuzz-testcase-4821293192970240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 222c9f031d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
60385207aa
avcodec/mjpegdec: Fix runtime error: left shift of negative value -127
...
Fixes: 733/clusterfuzz-testcase-4682158096515072
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 800d02abe0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
d63cec6ce3
avcodec/wavpack: Fix runtime error: left shift of negative value -5
...
Fixes: 729/clusterfuzz-testcase-5154831595470848
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3016e919d4 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
9b783dc492
avcodec/wavpack: Fix runtime error: left shift of negative value -2
...
Fixes: 723/clusterfuzz-testcase-6471394663596032
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ba15005132 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
43919b6e2e
avcodec/mpeg4videodec: Fix runtime error: signed integer overflow: 134527392 * 16 cannot be represented in type 'int'
...
This checks the sprite delta intermediates for overflow
Fixes: 716/clusterfuzz-testcase-4890287480504320
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fab13bbbcd )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
b31b1499cf
avcodec/mpeg12dec: Fix runtime error: left shift of negative value -13
...
Fixes: 709/clusterfuzz-testcase-4789836449841152
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d757ddbaab )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
87ae545648
avcodec/h264_mvpred: Fix multiple runtime error: left shift of negative value
...
Fixes: 710/clusterfuzz-testcase-5091051431788544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ab998f4c7f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
0cabddc13b
avcodec/adxdec: Fix runtime error: left shift of negative value -1
...
Fixes: 705/clusterfuzz-testcase-5129572590813184
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d23727e042 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
4071e7eaab
avcodec/mpeg4videodec: Improve the overflow checks in mpeg4_decode_sprite_trajectory()
...
Also clear the state on errors
Fixes integer overflows in 701/clusterfuzz-testcase-6594719951880192
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit eb41956636 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
fe4b666707
avcodec/mjpegdec: Fix runtime error: left shift of negative value -511
...
Fixes: 693/clusterfuzz-testcase-6109776066904064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4b72d5cd6f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
a07319a0cc
avcodec/h264_direct: Fix runtime error: left shift of negative value -14
...
Fixes: 682/clusterfuzz-testcase-4799120021651456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4bd3f1ce3e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
4c91e1eb5c
avcodec/pictordec: Check plane value before doing value/mask computations
...
Fixes integer overflow
Fixes: 675/clusterfuzz-testcase-6722971232108544
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 63e400a880 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
aa34d29b2e
avcodec/mpeg4videodec: Fix runtime error: left shift of negative value -2650
...
Fixes: 674/clusterfuzz-testcase-6713275880308736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 25e93aacc2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
5d21cfb170
avcodec/eac3dec: Fix runtime error: left shift of negative value -3
...
Fixes: 672/clusterfuzz-testcase-5595018867769344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 87eb374970 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
842c0b9f59
avcodec/mpeg12dec: Fix runtime error: left shift of negative value -2
...
671/clusterfuzz-testcase-4990381827555328
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit aff8cf18cb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
be3852ab9b
avcodec/mpeg4videodec: Check the other 3 sprite points for intermediate overflows
...
This is not necessarily specific to fuzzed files
Fixes: Multiple integer overflows
Fixes: 656/clusterfuzz-testcase-6463814516080640
Fixes: 658/clusterfuzz-testcase-6691260146384896
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 76ba09d182 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
025af5ccd1
avcodec/mpeg4videodec: Check sprite_offset in addition to shifts
...
Fixes: 651/clusterfuzz-testcase-5710668915277824
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6871df02d9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
706dd2331a
avcodec/mpeg4video: Fix runtime error: left shift of negative value
...
Fixes: 644/clusterfuzz-testcase-4726434209726464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6179dc8aa7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
0ccc767a15
avcodec/ituh263dec: Fix runtime error: left shift of negative value -22
...
Fixes: 639/clusterfuzz-testcase-5143866241974272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 631f748491 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
e2b46de961
avcodec/rv40: Fix runtime error: left shift of negative value
...
Fixes: 630/clusterfuzz-testcase-6608718928019456
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 956472a323 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
297b077b49
avcodec/h264_cabac: runtime error: signed integer overflow: 2147483647 + 14 cannot be represented in type 'int'
...
Fixes: 614/clusterfuzz-testcase-4931860079575040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 258763ad0e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
09dfcb857e
avcodec/mpeg4videodec: Fix runtime error: shift exponent -2 is negative
...
Fixes: 612/clusterfuzz-testcase-4707817137111040
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit aa2b75263e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
6be28e7545
avcodec/mjpegdec: Fix runtime error: left shift of negative value -507
...
Fixes: 611/clusterfuzz-testcase-5613455820193792
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c91bdd4524 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
762bf27fcc
avcodec/eac3dec: Fix runtime error: left shift of negative value
...
Fixes: 610/clusterfuzz-testcase-4831030085156864
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 067485b673 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
8161ebbcc3
avcodec/htmlsubtitles: Fix reading one byte beyond the array
...
Fixes: fuzz-2-ffmpeg_SUBTITLE_AV_CODEC_ID_SUBRIP_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 04bd1b38ee )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
3e6b3d20b2
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 >
(cherry picked from commit 967feea5eb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
e1ebd54a26
avcodec/vp56: Reset have_undamaged_frame on resolution changes
...
Fixes: timeout in 758/clusterfuzz-testcase-4720832028868608
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6e913f2129 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Thomas Guilbert
c73128381f
avcodec/vp8: Fix hang with slice threads
...
Fixes: 447860.webm
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9bbc73ae9f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
cc08c44904
avcodec/vp8: Check for the bitstream end per MB in decode_mb_row_no_filter()
...
Fixes: timeout in 730/clusterfuzz-testcase-5265113739165696 (part 2 of 2)
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1afd246960 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
9e0e1e3d54
avcodec/vp568: Check that there is enough data for ff_vp56_init_range_decoder()
...
Fixes: timeout in 730/clusterfuzz-testcase-5265113739165696 (part 1 of 2)
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 55d7371fe0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
4770ef8742
avcodec/vp8: remove redundant check
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5098a6f627 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
c098e99d06
avcodec/vp56: Require a correctly decoded frame before using vp56_conceal_mb()
...
Fixes timeout with 700/clusterfuzz-testcase-5660909504561152
Fixes timeout with 702/clusterfuzz-testcase-4553541576294400
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2ce4f28431 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
de43cdb2f5
avcodec/vp3: Do not return random positive values but the buf size
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d8094a303b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
b8b8e4f9eb
avcodec/vp8: Check for bitsteam end in decode_mb_row_no_filter()
...
Fixes timeout with 686/clusterfuzz-testcase-5853946876788736
this shortcuts (i.e. speeds up) the error and
return-to-user when decoding a truncated frame
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Previous version reviewed by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7b5ff7d573 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
4b1f14dcf5
avcodec/vp56: Factorize vp56_render_mb() out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4c0139463c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
d7d2a121a3
avcodec/vp3dsp: Fix multiple signed integer overflow: 46341 * 47523 cannot be represented in type 'int'
...
Fixes: 664/clusterfuzz-testcase-4917047475568640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2b8b7921c5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
bf780cbd99
Add CHECK/SUINT code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4614bf2caf )
(cherry picked from commit e8d4eacc07 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
3dd0166bde
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 >
(cherry picked from commit a720b854b0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
11477cdba5
avcodec/vp56: Clear dimensions in case of failure in the middle of a resolution change
...
Similar code is used elsewhere in vp56 to force a more complete reinit in the future.
Fixes null pointer dereference
Fixes: 707/clusterfuzz-testcase-4717453097566208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4bed066377 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
47c30a60e6
avcodec/vp56: Implement very basic error concealment
...
This should fix the fate failure due to a truncated last frame.
Alternatively the frame could be dropped.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d34bf886e9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
eaa6ac7ffd
avcodec/amrwbdec: Fix 2 runtime errors: left shift of negative value -1
...
Fixes: 669/clusterfuzz-testcase-4847965409640448
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6bd79ba59f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
891f354796
avcodec/pngdec: Fix runtime error: left shift of 152 by 24 places cannot be represented in type 'int'
...
Fixes: 666/clusterfuzz-testcase-6581447227867136
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 310d2af319 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
1e301c21d7
avcodec/vp56: Fix sign typo
...
Fixes: 664/clusterfuzz-testcase-4917047475568640
The change to fate is due to a truncated last frames which is now detected as damaged.
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 513a349439 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
24a9a51e57
avcodec/mpegaudiodec_template: Correct return code on id3 tag discarding
...
Fixes: 665/clusterfuzz-testcase-4863789881098240
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5d81616be3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
1108c628ba
avcodec/rv34: Simplify and factor get_slice_offset() code
...
This also fixes several integer overflows by checking each value before
use.
Fixes: 662/clusterfuzz-testcase-4898131432964096
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8696f25444 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
116120045b
avcodec/pictordec: Do not read more than nb_planes
...
Fixes undefined behavior
Fixes: 622/clusterfuzz-testcase-5745722022428672
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 01d196a67d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
ccce40356a
avcodec/srtdec: Fix signed integer overflow: 1811992524 * 384 cannot be represented in type 'int'
...
Fixes: 617/clusterfuzz-testcase-6413875723370496
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c11d3634b0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
508b8c3569
avcodec/pngdec: Check bit depth for validity
...
Fixes: runtime error: shift exponent 132 is too large for 32-bit type 'int'
Fixes: 609/clusterfuzz-testcase-4825202619842560
See 11.2.2 IHDR Image header
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4279613a26 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
edb15cce00
avcodec/mpeg12dec: Fix runtime error: left shift of negative value
...
Fixes: 608/clusterfuzz-testcase-603978286392934
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 706757d26d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
5ee27f48d7
avcodec/wavpacl: Fix runtime error: left shift of negative value -1
...
Fixes: 607/clusterfuzz-testcase-5108792465293312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 12eebb845a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Michael Niedermayer
758258f567
avformat/http: Check for truncated buffers in http_connect()
...
Reported-by: SleepProgger <security@gnutp.com >
Reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8fa18e042a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-05-14 12:20:15 +02:00
Aaron Levinson
9cf601f87d
avformat/utils: free AVStream.codec properly in free_stream()
...
Fixes memory leaks.
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit b9d2005ea5 )
2017-05-11 21:18:07 -03:00
James Almer
65add3a818
avcodec/options: do a more thorough clean up in avcodec_copy_context()
...
Free coded_frame and coded_side_data to prevent potential leaks.
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com >
Tested-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit cac8de2da5 )
2017-05-11 21:16:54 -03:00
James Almer
8d9f927078
avcodec/options: factorize avcodec_copy_context() cleanup code
...
Reviewed-by: Aaron Levinson <alevinsn@aracnet.com >
Tested-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 54a4c9b4e9 )
2017-05-11 21:16:28 -03:00
James Almer
49279d4cc2
avformat/concatdec: fix the h264 annexb extradata check
...
The start code can be either in the first three or four bytes.
(cherry picked from commit b4330a0e02 )
2017-05-11 21:12:12 -03:00
Mark Thompson
016064625f
hwcontext_vdpau: Fix missing subscripts
...
Also remove the redundant casts which were hiding the error here.
Fixes Ubuntu bug 1688735, reported by andysem.
(cherry picked from commit 7081620aca )
2017-05-09 14:45:54 +02:00
Carl Eugen Hoyos
582c3d514a
lavf/flacdec: Return maximum score if the streaminfo header is valid.
...
Fixes ticket #6208 .
(cherry picked from commit 3733039610 )
2017-03-30 01:41:22 +02:00
Paul B Mahol
a60e665162
avcodec/dnxhd_parser: take into account compressed frame size and skip it
...
Fixes #6214 and vsynth1-dnxhd-720p-hr-lb.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
(cherry picked from commit e1940d2458 )
2017-03-24 19:57:36 +01:00
James Almer
33978a49c0
avformat/apng: fix setting frame delay when max_fps is set to no limit
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 874eb012f7 )
2017-03-21 20:22:12 -03:00
James Almer
2bf28b9db6
swresample/resample: free existing ResampleContext on reinit
...
Fixes memleak.
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit db7a05dab0 )
2017-03-21 12:12:09 -03:00
James Almer
2d322bf3e9
swresample/resample: move resample_free() higher in the file
...
Also make it more readable while at it.
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 2a8a8a2e98 )
2017-03-21 12:11:57 -03:00
James Almer
36fff6c754
avformat/matroskaenc: don't write DisplayUnit with value Unknown on WebM files
...
Value 4 (Unknown) is for the time being part of the Matroska spec but not
supported by WebM
Addresses ticket #6176
(cherry picked from commit 1ad60e4e70 )
2017-02-21 21:18:07 -03:00
Rostislav Pehlivanov
5546294f63
lavfi/buffersrc: fix directly setting channel layout
...
When setting the channel layout directly using AVBufferSrcParameters
the channel layout was correctly set however the init function still
expected the old string format to set the number of channels (when it
hadn't already been specified).
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
(cherry picked from commit 42959044ac )
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2017-02-21 16:40:53 +00:00
Carl Eugen Hoyos
e93e215b36
lavf/mpeg: Initialize a stack variable used by memcmp().
...
Silence a valgrind warning.
Fixes ticket #6160 .
(cherry picked from commit a5c1c7a8b3 )
2017-02-21 02:16:13 +01:00
Carl Eugen Hoyos
5c524e651f
lavc/avpacket: Initialize a variable in error path.
...
Fixes ticket #6153 .
Tested-by: Tyson Smith
(cherry picked from commit 1d54be2153 )
2017-02-17 10:44:56 +01:00
Matt Wolenetz
d4b731e271
lavf/mov.c: Avoid heap allocation wraps in mov_read_{senc,saiz}()
...
Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643952 (senc,saiz portions)
Signed-off-by: Matt Wolenetz <wolenetz@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 36aba43bd5 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-10 12:15:17 +01:00
Matt Wolenetz
927e59b74a
lavf/mov.c: Avoid OOB in mov_read_udta_string()
...
Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643952 (udta_string portion)
Signed-off-by: Matt Wolenetz <wolenetz@chromium.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9bbdf5d921 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-10 12:14:39 +01:00
Michael Niedermayer
cbe65ccfa0
Update for 3.2.4
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-08 20:30:18 +01:00
Michael Niedermayer
63637e457c
avcodec/h264_slice: Clear ref_counts on redundant slices
...
Fixes reading freed memory
Fixes: 568/clusterfuzz-testcase-6107186067406848
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c03029a835 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-08 19:22:05 +01:00
Matt Wolenetz
ed2572b9c8
lavf/mov.c: Avoid heap allocation wrap in mov_read_uuid
...
Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643951
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
Check value reduced as the code does not support values beyond INT_MAX
Also the check is moved to a more common place and before integer truncation
(cherry picked from commit 2d453188c2 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-08 04:08:48 +01:00
Matt Wolenetz
cf8e004a51
lavf/mov.c: Avoid heap allocation wrap in mov_read_hdlr
...
Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643950
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
Check value reduced as the code does not support larger lengths
(cherry picked from commit fd30e4d57f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-08 04:08:25 +01:00
Michael Niedermayer
a1a14982ec
avcodec/pictordec: Fix logic error
...
Fixes: 559/clusterfuzz-testcase-6424225917173760
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8c2ea3030a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-07 21:33:20 +01:00
Michael Niedermayer
29ef35abff
ffserver_config: Setup codecpar in add_codec()
...
fixes segfault in the status page code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 472fee91bc )
2017-02-07 13:21:14 +01:00
Michael Niedermayer
1fd78b9b34
Changelog: fix typos
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-07 13:21:03 +01:00
Michael Niedermayer
68ed682710
Update for 3.2.3
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 12:26:47 +01:00
Michael Niedermayer
44ce16b7f9
avcodec/movtextdec: Fix decode_styl() cleanup
...
Fixes: null pointer dereference
Fixes: 555/clusterfuzz-testcase-5986646595993600
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e248522d1b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 12:11:37 +01:00
Chris Cunningham
d88493c02b
lavf/matroskadec: fix is_keyframe for early Blocks
...
Blocks are marked as key frames whenever the "reference" field is
zero. This breaks for non-keyframe Blocks with a reference timestamp
of zero.
The likelihood of reference timestamp being zero is increased by a
longstanding bug in muxing that encodes reference timestamp as the
absolute time of the referenced frame (rather than relative to the
current Block timestamp, as described in MKV spec).
Now using INT64_MIN to denote "no reference".
Reported to chromium at http://crbug.com/497889 (contains sample)
(cherry picked from commit ac25840ee3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 11:00:24 +01:00
James Almer
87a47c67a6
configure: bump year
...
Happy new year!
(cherry picked from commit d800d48fc6 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 10:17:13 +01:00
Michael Niedermayer
7e1d9d25fe
avcodec/pngdec: Check trns more completely
...
Fixes out of array access
Fixes: 546/clusterfuzz-testcase-4809433909559296
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e477f09d0b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 10:17:13 +01:00
Michael Niedermayer
d399f25bd1
avcodec/interplayvideo: Move parameter change check up
...
Fixes out of array read
Fixes: 544/clusterfuzz-testcase-5936536407244800.f8bd9b24_8ba77916_70c2c7be_3df6a2ea_96cd9f14
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit b1e2192007 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 10:17:13 +01:00
Michael Niedermayer
7323a8ab29
avcodec/dca_lbr: Fix off by 1 error in freq check
...
Fixes out of array read
Fixes: 510/clusterfuzz-testcase-5737865715646464
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 61f70416f8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 10:17:13 +01:00
Michael Niedermayer
aa20863f44
avcodec/mjpegdec: Check for for the bitstream end in mjpeg_decode_scan_progressive_ac()
...
Fixes timeout
Fixes: 496/clusterfuzz-testcase-5805083497332736
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 3782656631 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-02-06 10:17:13 +01:00
Andreas Cadhalpun
83269fd13b
pgssubdec: reset rle_data_len/rle_remaining_len on allocation error
...
The code relies on their validity and otherwise can try to access a NULL
object->rle pointer, causing segmentation faults.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 842e98b4d8 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2017-02-01 02:28:09 +01:00
Andreas Cadhalpun
884cd3caa5
swscale: save ebx register when it is not available
...
Configure checks if the ebx register can be used for asm and it has to
be saved if and only if this is not the case.
Without this the build fails when configuring with --toolchain=hardened
--disable-pic on i386 using gcc 4.8:
error: PIC register clobbered by '%ebx' in 'asm'
In that case gcc 4.8 reserves the ebx register for the GOT needed for
PIE, so it can't be used in asm directly.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 319438e2f2 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2017-01-26 02:22:09 +01:00
Frank Liberato
cc66247603
avformat/flacdec: Check avio_read result when reading flac block header.
...
Return AVERROR_INVALIDDATA if all four bytes aren't present.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 95bde49982 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:13 +01:00
Michael Niedermayer
dc2d3856f3
avcodec/utils: correct align value for interplay
...
Fixes out of array access
Fixes: 452/fuzz-1-ffmpeg_VIDEO_AV_CODEC_ID_INTERPLAY_VIDEO_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2080bc3371 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:13 +01:00
Michael Niedermayer
dd36b3a06a
avcodec/vp56: Check for the bitstream end, pass error codes on
...
Fixes timeout
Fixes: 446/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_VP6_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 9e6a242755 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:13 +01:00
Michael Niedermayer
14f555683a
avcodec/mjpegdec: Check remaining bitstream in ljpeg_decode_yuv_scan()
...
Fixes timeout
Fixes: 445/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_MJPEG_fuzzer
Fixes: 456/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_JPEGLS_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 755933cb5c )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:13 +01:00
Michael Niedermayer
bd6c1d5149
avcodec/pngdec: Fix off by 1 size in decode_zbuf()
...
Fixes out of array access
Fixes: 444/fuzz-2-ffmpeg_VIDEO_AV_CODEC_ID_PNG_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e371f031b9 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Andreas Cadhalpun
41fc098a86
libopenmpt: add missing avio_read return value check
...
This fixes heap-buffer-overflows in libopenmpt caused by interpreting
the negative size value as unsigned size_t.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Reviewed-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 367cac7827 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
3442c20c4d
avcodec/bsf: Fix av_bsf_list_free()
...
Negate null check
Fixes CID1396248
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 762bf6f4af )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
7d222736c2
avcodec/omx: Do not pass negative value into av_malloc()
...
Fixes CID1396849
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bd83c295fc )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Tobias Rapp
d5154c055b
avformat/avidec: skip odml master index chunks in avi_sync
...
Fixes pts gaps when reading AVI files > 256GiB generated by FFmpeg.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6d579d7c1b )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
cd81993070
avcodec/mjpegdec: Check for rgb before flipping
...
Fixes assertion failure due to unsupported case
Fixes: 356/fuzz-1-ffmpeg_VIDEO_AV_CODEC_ID_MJPEG_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 25d9643f11 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Matt Wolenetz
2481f1320a
lavf/utils.c Protect against accessing entries[nb_entries]
...
In ff_index_search_timestamp(), if b == num_entries,
m == num_entries - 1, and entries[m].flags & AVINDEX_DISCARD_FRAME is
true, then the search for the next non-discarded packet could access
entries[nb_entries], exceeding its bounds. This change adds a protection
against that scenario. Reference: https://crbug.com/666770
Reviewed-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit fe7547d69e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
ceeeccc862
avutil/random_seed: Reduce the time needed on systems with very low precission clock()
...
This should fix issues on BSD
CLOCKS_PER_SEC is 128 on BSD while SUSv2 requires it to be a million
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c4152fc42e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
07df85b958
swscale/swscale: Fix dereference of stride array before null check
...
Fixes: CID1396263
Fixes: CID1396271
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 03ce71e4a1 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
7643e8584f
avutil/random_seed: Improve get_generic_seed() with higher precission clock()
...
Tested-by: Thomas Turner <thomastdt@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit da73d95bad )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Chris Cunningham
533431d5af
avformat/mp3dec: fix msan warning when verifying mpa header
...
MPEG Audio frame header must be 4 bytes. If we fail to read
4 bytes bail early to avoid Use-of-uninitialized-value msan error.
Reference https://crbug.com/666874 .
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ab87df9a47 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
9519b2560e
avformat/utils: Print verbose error message if stream count exceeds max_streams
...
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f0bdd53871 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Michael Niedermayer
3e3e095fc9
avformat/options_table: Set the default maximum number of streams to 1000
...
Fixes CVE-2016-9561, Note the security relevance of this is disputed as
running out of memory can happen with valid files
Suggested-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 30581c51e7 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2017-01-26 00:34:12 +01:00
Georgi D. Sotirov
41f8a8843d
lavf/chromaprint: Update for version 1.4
...
Fixes ticket #5997 .
(cherry picked from commit 581f93f37e )
Fixes Debian bug 841501.
2017-01-15 11:53:41 +01:00
Michael Niedermayer
64bb329afa
avutil: Add av_image_check_size2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit f542b152aa )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-11 00:21:53 +01:00
Michael Niedermayer
3ecbac5664
avformat: Add max_streams option
...
This allows user apps to stop OOM due to excessive number of streams
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1296f84495 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-11 00:21:53 +01:00
Michael Niedermayer
0e6febff5a
avcodec/ffv1enc: Allocate smaller packet if the worst case size cannot be allocated
...
We are checking during encoding if there is enough space as version 4 needs that
check.
Fixes Ticket6005
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 38a7834bbb )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-11 00:21:53 +01:00
Michael Niedermayer
3f779aef79
avcodec/mpeg4videodec: Fix undefined shifts in mpeg4_decode_sprite_trajectory()
...
Fixes: part of 670190.ogg
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 8258e36385 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-11 00:21:53 +01:00
Michael Niedermayer
35ef033a19
avformat/oggdec: Skip streams in duration correction that did not had their duration set.
...
Fixes: part of 670190.ogg
Fixes integer overflow
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ee2a6f5df8 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-11 00:21:53 +01:00
Michael Niedermayer
aec21cd840
avcodec/ffv1enc: Fix size of first slice
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit cff1c0edaa )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-11 00:21:53 +01:00
Marton Balint
47e47cfb07
ffplay: fix sws_scale possible out of bounds array access
...
As I used simple RGBA formats for subtitles and for the video texture if
avfilter is disabled I kind of assumed that sws_scale won't access data
pointers and strides above index 0, but apparently that is not the case.
Fixes Coverity CID 1396737, 1396738, 1396739, 1396740.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-12-10 23:24:05 +01:00
Srinath K R
314c425b16
avfilter/vf_hwupload_cuda: Add min/max limits for the 'device' option
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-12-08 11:26:34 +01:00
Michael Niedermayer
148c4fb8d2
Update for 3.2.2
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:09:40 +01:00
Michael Niedermayer
c12ee64e80
ffserver: Check chunk size
...
Fixes out of array access
Fixes: poc_ffserver.py
Found-by: Paul Cher <paulcher@icloud.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a5d25faa3f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
46cd1699f9
Avoid using the term "file" and prefer "url" in some docs and comments
...
This should make it less ambigous that these are URLs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a5f27a9c3a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
32b95471a8
avformat/rtmppkt: Check for packet size mismatches
...
Fixes out of array access
Found-by: Paul Cher <paulcher@icloud.com >
Reviewed-by: Paul Cher <paulcher@icloud.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7d57ca4d9a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Timothy Gu
f66bfe71bb
zmqsend: Initialize ret to 0
...
Fixes CID1396857.
(cherry picked from commit d903b4e3ad )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
af1e19b9e4
avcodec/flacdec: Fix undefined shift in decode_subframe()
...
Fixes undefined behavior
Fixes: 639961-media
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1f5630af51 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
334901aea0
avcodec/get_bits: Fix get_sbits_long(0)
...
Fixes undefined behavior
Fixes: 640889-media
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit c72fa43234 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
bbe9a4b542
avformat/ffmdec: Check media type for chunks
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e706e2e775 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
a772aaf5dc
avcodec/flacdec: Fix signed integer overflow in decode_subframe_fixed()
...
Fixes undefined behavior
Fixes: 640912-media
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 83a75bf6c3 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
c39e8d05f5
avcodec/flacdsp_template: Fix undefined shift in flac_decorrelate_indep_c
...
Fixes: left shift of negative value
Fixes: 668346-media
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit acc163c6ab )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
a0715c1e89
avformat/oggparsespeex: Check frames_per_packet and packet_size
...
The speex specification does not seem to restrict these values, thus
the limits where choosen so as to avoid multiplicative overflow
Fixes undefined behavior
Fixes: 635422.ogg
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit afcf15b0db )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
a0ed412f38
avformat/utils: Check start/end before computing duration in update_stream_timings()
...
Fixes undefined behavior
Fixes: 637428.ogg
Found-by: Matt Wolenetz <wolenetz@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 90da187f1d )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
2fb7eb05dc
avcodec/flac_parser: Update nb_headers_buffered
...
Fixes infinite loop
Fixes: fuzz.flac
Found-by: Frank Liberato <liberato@google.com >
Reviewed-by: Frank Liberato <liberato@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2475858889 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
8e4f737d2f
avformat/idroqdec: Check chunk_size for being too large
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 744a0b5206 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
2d51cb1d0a
avcodec/me_cmp: Fix median_sad size
...
Fixes out of array read
Fixes: COV1396255
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit d9883ded34 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
Michael Niedermayer
c165bad0c0
avformat/utils: Fix type mismatch
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a06e84b56e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-12-06 00:07:50 +01:00
James Almer
16aa8c8146
configure: check for strtoull on msvc
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit b52d3574d4 )
2016-12-05 19:20:59 -03:00
Ronald S. Bultje
e5be73e178
http: move chunk handling from http_read_stream() to http_buf_read().
...
(cherry picked from commit 845bb40178 )
2016-12-05 16:20:12 -05:00
Ronald S. Bultje
0e0a413725
http: make length/offset-related variables unsigned.
...
Fixes #5992 , reported and found by Paul Cher <paulcher@icloud.com >.
(cherry picked from commit 2a05c8f813 )
2016-12-05 16:20:12 -05:00
James Almer
c269c43a83
avcodec/aac_adtstoasc_bsf: validate and forward extradata if the stream is already ASC
...
Fixes ticket #5973
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 6e1902bab4 )
2016-11-25 18:51:00 -03:00
Andreas Cadhalpun
6f3e3cb8ba
Update Changelog
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:23:39 +01:00
Andreas Cadhalpun
d147114b9d
mss2: only use error correction for matching block counts
...
This fixes a heap-buffer-overflow in ff_er_frame_end when decoding mss2
with coded_width/coded_height larger than width/height.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 2566ad98b0 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:22:19 +01:00
Andreas Cadhalpun
ad82036626
softfloat: decrease MIN_EXP to cover full float range
...
floats are not necessarily normalized, so a normalized softfloat needs
MIN_EXP lowered by 23 to cover that range.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 2d6f46d801 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:22:15 +01:00
Andreas Cadhalpun
a6a2d9d1e5
libopusdec: default to stereo for invalid number of channels
...
This fixes an out-of-bounds read if avc->channels is 0.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 8c8f543b81 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:22:11 +01:00
Andreas Cadhalpun
6ad2773142
flvdec: require need_context_update when changing codec id
...
Otherwise the codec context and codecpar might disagree on the codec id,
triggering asserts in av_parser_parse2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 98b3a7979f )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:22:07 +01:00
Andreas Cadhalpun
1dc59aaf61
pgssubdec: only set w/h/linesize when allocating data
...
Rects with positive w/h/linesize but no data are invalid.
Reviewed-by: Petri Hintukainen <phintuka@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 995512328e )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:21:52 +01:00
Andreas Cadhalpun
9aaddbf0ef
sbgdec: prevent NULL pointer access
...
Reviewed-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit dbefbb61b7 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:21:48 +01:00
Andreas Cadhalpun
e00fec907f
rmdec: validate block alignment
...
This fixes division by zero crashes.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit de4ded0636 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:21:44 +01:00
Andreas Cadhalpun
d8364f4e1d
smacker: limit recursion depth of smacker_decode_bigtree
...
This fixes segmentation faults due to stack-overflow caused by too deep
recursion.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 946ecd19ea )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:21:39 +01:00
Andreas Cadhalpun
7d0cc12a56
mxfdec: fix NULL pointer dereference in mxf_read_packet_old
...
Metadata streams have priv_data set to NULL.
Reviewed-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit fdb8c455b6 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:21:33 +01:00
Andreas Cadhalpun
de031809f3
ffmdec: validate codec parameters
...
A negative extradata size for example gets passed to memcpy in
avcodec_parameters_from_context causing a segmentation fault.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 1c7da19a4b )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-25 22:21:14 +01:00
Michael Niedermayer
6550d0580b
Update for 3.2.1
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-25 21:27:40 +01:00
Michael Niedermayer
dff4f58107
avformat/mpeg: Adjust vid probe threshold to correct mis-detection
...
Fixes: _ij.mp3
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 4e5049a230 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-23 20:29:31 +01:00
Michael Niedermayer
e9f3cc7fc7
avcodec/ass_split: Change order of operations in ass_split_section()
...
This matches the other branch
Fixes out of array read
Fixes: 4d142ca76d39fe685effcf5017098723/asan_heap-oob_31ae824_8611_348fdb64f9009b63c8a8eae9a0e497c5.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit ae514b1254 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-23 20:29:31 +01:00
James Almer
ee56777379
avcodec/rawdec: check for side data before checking its size
...
Fixes valgrind warnings about usage of uninitialized values.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 51e329918d )
2016-11-19 23:50:37 -03:00
James Almer
3bd7ad58a7
avcodec/avpacket: fix leak on realloc in av_packet_add_side_data()
...
If realloc fails, the pointer is overwritten and the previously allocated
buffer is leaked, which goes against the expected behavior of keeping the
packet unchanged in case of error.
Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 574929d8b6 )
2016-11-19 20:24:54 -03:00
James Almer
f97bee9ad5
avformat/apngenc: use the stream parameters extradata if available
...
Fixes remuxing apng streams coming from the apng demuxer, which sends extradata
during init.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-11-18 12:33:31 -03:00
James Almer
cf655d1643
Revert "apngdec: use side data to pass extradata to the decoder"
...
This reverts commit e0c6b32046 .
Said commit changed the behavior of the demuxer and decoder in a non
backwards compatible way.
Demuxers should make extradata available at init if possible, and send
new extradata as side data within a packet if needed.
A better fix for the remuxing crash will follow.
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 16c429166d )
2016-11-18 12:33:21 -03:00
Stefano Sabatini
31c9c7ad82
ffprobe: fix crash in case -of is specified with an empty string
...
Fix trac issue #5957 .
(cherry picked from commit 427a47abcd )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:51:21 +01:00
Martin Vignali
08f26d99b5
libavcodec/exr : fix channel size calculation for uint32 channel
...
uint32 need 4 bytes not 1.
Fix decoding when there is half/float and uint32 channel.
This fixes crashes due to pointer corruption caused by invalid writes.
The problem was introduced in commit
03152e74df .
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 52da3f6f70 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:37:05 +01:00
Andreas Cadhalpun
c7d38efbc2
exr: fix out-of-bounds read
...
channel_index can be -1.
This problem was introduced in commit
2dd7b46132 .
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit ffdc5d09e4 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:19:01 +01:00
Andreas Cadhalpun
cbc9d46066
libschroedingerdec: fix leaking of framewithpts
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 3c0328d58d )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:18:56 +01:00
Andreas Cadhalpun
2b863d4e9b
libschroedingerdec: don't produce empty frames
...
They are not valid and can cause problems/crashes for API users.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit a86ebbf7f6 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:18:53 +01:00
Andreas Cadhalpun
598016b85f
dds: limit 4 bpp handling to AV_PIX_FMT_PAL8
...
This fixes NULL pointer dereferencing for formats, where frame->data[1]
is not allocated.
The problem was introduced in commit
257fbc3af4 .
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 90ebf3c428 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:18:48 +01:00
Andreas Cadhalpun
a2c7840a6b
mlz: limit next_code to data buffer size
...
This fixes a heap-buffer-overflow detected by AddressSanitizer.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 1abcd972c4 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:18:42 +01:00
Andreas Cadhalpun
c8f5154fc1
softfloat: handle -INT_MAX correctly
...
This is similar to commit 9ac61e73d0 .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 0edd569466 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:18:35 +01:00
Andreas Cadhalpun
b526958ca4
filmstripdec: correctly check image dimensions
...
This prevents a division by zero in read_packet.
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 25012c5644 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:18:29 +01:00
Andreas Cadhalpun
039a3e6db8
pnmdec: make sure v is capped by maxval
...
Otherwise put_bits can be called with a value that doesn't fit in the
sample_len, causing an assertion failure.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit cdb5479c9d )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:17:58 +01:00
Andreas Cadhalpun
d8affeea82
smvjpegdec: make sure cur_frame is not negative
...
This fixes a heap-buffer-overflow detected by AddressSanitizer.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 360bc0d90a )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:17:20 +01:00
Andreas Cadhalpun
1615d83dcf
icodec: correctly check avio_read return value
...
It can read less than the requested amount, in which case buf contains
uninitialized data, causing problems like segmentation faults later on.
Also make sure that image->size is positive, so that it can't match a
negative error code.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 89eb398c7f )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:16:48 +01:00
Andreas Cadhalpun
41359d381a
icodec: fix leaking pkt on error
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 467eece1be )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:16:43 +01:00
Andreas Cadhalpun
581cce0cca
dvbsubdec: fix division by zero in compute_default_clut
...
This problem was introduced in commit
4b90dcb849 .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit c82b8ef0e4 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:15:52 +01:00
Andreas Cadhalpun
1ed4b52732
proresdec_lgpl: explicitly check coff[3] against slice_data_size
...
The implicit checks via v_data_size and a_data_size don't work in the case
'(hdr_size > 7) && !ctx->alpha_info'.
This fixes segmentation faults due to invalid reads.
This problem was introduced in commit
547c2f002a .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 1e33035ee7 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:15:47 +01:00
Andreas Cadhalpun
72a2d6ff56
escape124: reject codebook size 0
...
It causes a cb_depth of 32, leading to assertion failures in get_bits.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 226d35c845 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:15:42 +01:00
Andreas Cadhalpun
9dee25fbc7
mpegts: prevent division by zero
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 1bbb18fe82 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:15:07 +01:00
Andreas Cadhalpun
fa24e3780b
matroskadec: fix NULL pointer dereference in webm_dash_manifest_read_header
...
The code assumes that s->streams[0] is valid.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit ff100c9dd9 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:14:52 +01:00
Andreas Cadhalpun
1e4979f780
mpegaudio_parser: don't return AVERROR_PATCHWELCOME
...
The API does not allow returning AVERROR codes.
It triggers an assert in av_parser_parse2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 5249706e9d )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:14:01 +01:00
Andreas Cadhalpun
c11fd9de76
mxfdec: fix NULL pointer dereference
...
Metadata streams have priv_data set to NULL.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 0efb610611 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:13:29 +01:00
Andreas Cadhalpun
c72ac9ffd0
lzf: update pointer p after realloc
...
This fixes heap-use-after-free detected by AddressSanitizer.
Reviewed-by: Luca Barbato <lu_zero@gentoo.org >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit bb6a7b6f75 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:13:19 +01:00
Andreas Cadhalpun
31cebfe789
diracdec: check return code of get_buffer_with_edge
...
If it fails, buffers aren't allocated, causing NULL pointer dereferencing.
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit db79dedb1a )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:13:14 +01:00
Andreas Cadhalpun
b9a24cee3b
diracdec: clear slice_params_num_buf on allocation failure
...
Otherwise it can be non-zero next time decode_lowdelay is called, causing
slice_params_buf not to be allocated, leading to a NULL pointer dereference.
The problem was introduced in commit
dcad4677d6 .
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 24d20496d2 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:13:05 +01:00
Andreas Cadhalpun
08b1fd6afb
diracdec: use correct buffer for slice_params_buf realloc
...
This fixes a double-free detected by AddressSanitizer.
The problem was introduced in commit
dcad4677d6 .
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 8a4ea96448 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:12:58 +01:00
Andreas Cadhalpun
35cb0c47bc
ppc: pixblockdsp: do unaligned block accesses correctly again
...
This was broken by the following Libav commit:
4c387c7 ppc: dsputil: do unaligned block accesses correctly
The following tests fail due to this:
fate-checkasm
fate-vsynth1-dnxhd-2k-hr-hq fate-vsynth1-dnxhd-edge1-hr
fate-vsynth1-dnxhd-edge2-hr fate-vsynth1-dnxhd-edge3-hr
fate-vsynth1-dnxhd-hr-sq-mov fate-vsynth1-dnxhd-hr-hq-mov
fate-vsynth2-dnxhd-2k-hr-hq fate-vsynth2-dnxhd-edge1-hr
fate-vsynth2-dnxhd-edge2-hr fate-vsynth2-dnxhd-edge3-hr
fate-vsynth2-dnxhd-hr-sq-mov fate-vsynth2-dnxhd-hr-hq-mov
fate-vsynth3-dnxhd-2k-hr-hq fate-vsynth3-dnxhd-edge1-hr
fate-vsynth3-dnxhd-edge2-hr fate-vsynth3-dnxhd-edge3-hr
fate-vsynth3-dnxhd-hr-sq-mov fate-vsynth3-dnxhd-hr-hq-mov
Fixes trac ticket #5508 .
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 3932ccc472 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:12:50 +01:00
Andreas Cadhalpun
dc2942bbc8
avformat: close parser if codec changed
...
The parser depends on the codec and thus must not be used with a different one.
If it is, the 'avctx->codec_id == s->parser->codec_ids[0] ...' assert in
av_parser_parse2 gets triggered.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit f84ae3f04a )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:12:43 +01:00
Andreas Cadhalpun
35db873534
fate: add streamcopy test for apng
...
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 719c15aa9a )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:12:33 +01:00
Andreas Cadhalpun
3e33685892
apngdec: use side data to pass extradata to the decoder
...
Fixes remuxing apng streams coming from the apng demuxer.
This is a regression since 940b8908b9 .
Found-by: James Almer <jamrial@gmail.com >
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit e0c6b32046 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:12:29 +01:00
Andreas Cadhalpun
d95568f9a2
mov: immediately return from mov_fix_index without old index entries
...
If there are no index entries, e_old = st->index_entries is only one
byte large, since it was created by av_realloc called with size 0.
Thus accessing e_old[0].timestamp causes a heap buffer overflow.
Reviewed-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 9d83b209d8 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:12:23 +01:00
Andreas Cadhalpun
6e5ccabbe8
interplayacm: increase bitstream buffer size by AV_INPUT_BUFFER_PADDING_SIZE
...
This fixes out-of-bounds reads by the bitstream reader.
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 60178e78f2 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:12:09 +01:00
Andreas Cadhalpun
266cf258cc
interplayacm: validate number of channels
...
The number of channels is used as divisor in decode_frame, so it must
not be zero to avoid SIGFPE crashes.
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 5540d6c134 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:11:57 +01:00
Andreas Cadhalpun
c90d521f16
interplayacm: check for too large b
...
This fixes out-of-bounds reads.
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 14e4e26559 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:11:49 +01:00
Andreas Cadhalpun
346fa70bb8
doc: fix spelling errors
...
Reviewed-by: Lou Logan <lou@lrcd.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 1e660fe88d )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:11:34 +01:00
Andreas Cadhalpun
e92f585bd9
configure: make sure LTO does not optimize out the test functions
...
Fixes trac ticket #5909
Bud-Id: https://bugs.gentoo.org/show_bug.cgi?id=598054
Acked-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 890eb3d7c4 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:11:29 +01:00
Andreas Cadhalpun
e622d7723b
fate: add apng encoding/muxing test
...
Also test the fallback to png creation for a single frame.
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 97792e85c3 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:11:22 +01:00
Andreas Cadhalpun
1af7ddecda
apng: use side data to pass extradata to muxer
...
This fixes creating apng files, which is broken since commit
5ef1959080 .
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
(cherry picked from commit 940b8908b9 )
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-11-17 23:11:12 +01:00
Michael Niedermayer
b9a0172260
avcodec/mpeg4videodec: Workaround interlaced mpeg4 edge MC bug
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2c9106257f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
3f6aae377a
avcodec/mpegvideo: Fix edge emu buffer overlap with interlaced mpeg4
...
Fixes Ticket5936
Regression since c5fc8ae126
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 85407c7e63 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
0f8de7a3db
avcodec/rv40: Test remaining space in loop of get_dimension()
...
Fixes infinite loop
Fixes: 178/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_RV40_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 1546d487cf )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
7e8eb30f40
avcodec/ituh263dec: Avoid spending a long time in slice sync
...
Fixes: 177/fuzz-3-ffmpeg_VIDEO_AV_CODEC_ID_FLV1_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2baf36caed )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
8deaed3b12
avcodec/movtextdec: Add error message for tsmb_size check
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0eb3198005 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
a0c6b4cfd1
avcodec/movtextdec: Fix tsmb_size check==0 check
...
Fixes: 173/fuzz-3-ffmpeg_SUBTITLE_AV_CODEC_ID_MOV_TEXT_fuzzer
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a609905723 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
20d0f32012
avcodec/movtextdec: Fix potential integer overflow
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 6ea2715768 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
07c5e65e6d
ffmpeg: Fix bsf corrupting merged side data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 11f24e71ff )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
7521d5b8da
avcodec/sunrast: Fix input buffer pointer check
...
Fixes: out of array read
Fixes: poc.dat
Found-by: Bingchang, Liu @VARAS of IIE
Tested-by: bc L <l.bing.chang.bc@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 37138338ff )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
487accbf19
avcodec/tscc: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 979bca5134 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
fa1ee96026
avcodec/rscc: Fix constant
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit e167610794 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
e8b9337281
avcodec/rawdec: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 5f0bc0215a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
aa896c182d
avcodec/rscc: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 0f64b6cd22 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
956407b5df
avcodec/msvideo1: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 161ccdaa06 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
7821c96dd0
avcodec/qpeg: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 16793504df )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
0c0aa5ebba
avcodec/qtrle: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 7d196f2a5a )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
3c1eb57d1e
avcodec/msrle: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a6330119a0 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
dc692ae1b7
avcodec/kmvc: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 2d99101d09 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
be756396b5
avcodec/idcinvideo: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit a2b8dde659 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
d8db018e31
avcodec/cinepak: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 121be31060 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
c9c619e667
avcodec/8bps: Check side data size before use
...
Fixes out of array read
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 042faa847f )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Michael Niedermayer
48ee545d11
avformat/flvdec: Fix regression loosing streams
...
Fixes: unknown_video.flv
Found-by: Thierry Foucu <tfoucu@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit 077939626e )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-11-17 12:47:40 +01:00
Anssi Hannula
7568b0f553
avformat/hls: Add missing error check for avcodec_parameters_copy()
...
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi >
(cherry picked from commit e2193b53ea )
2016-11-07 19:06:08 +02:00
Anssi Hannula
fc20e30058
avformat/hls: Fix probing mpegts audio streams that use probing
...
Commit 04964ac311 ("avformat/hls: Fix missing streams in some
cases with MPEG TS") caused a regression where subdemuxer streams that
use probing (e.g. dts/eac3/mp2 in mpegts) no longer get probed properly.
This is because the codec parameters from the subdemuxer stream, once
probed, are not passed on to the main stream.
Fix that by updating the codec parameters if the codec id changes.
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi >
(cherry picked from commit 3d2f636497 )
2016-11-07 19:06:08 +02:00
Anssi Hannula
32ceeb579e
avformat/hls: Factor copying stream info to a separate function
...
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi >
(cherry picked from commit 9a51cd35b8 )
2016-11-07 19:06:08 +02:00
Stephen Hutchinson
ebf8ec5b0f
avisynth: fix Planar RGB output
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
(cherry picked from commit bf14393635 )
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-27 17:24:04 +02:00
James Almer
548242d1a1
avcodec: remove missing incompatible_libav_abi references
...
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit bf709098c9 )
2016-10-26 17:37:10 -03:00
James Almer
e554c667bd
configure: remove missing incompatible_libav_abi references
...
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit 7400f64211 )
2016-10-26 17:37:06 -03:00
James Almer
e6f35a9cd8
avformat/matroskaenc: fix cue relative position values when CRC32 is enabled
...
The dynamic buffer does not contain the CRC32 element so calls to avio_tell()
don't take it into account. This resulted in CueRelativePosition values being
six bytes short.
This is a regression since 6724525a15
Instead of adding yet another custom check for CRC32 to fix a size or an offset,
remove the existing ones and reserve the six bytes in the dynamic buffer.
Signed-off-by: James Almer <jamrial@gmail.com >
(cherry picked from commit eabbc64728 )
2016-10-26 16:30:05 -03:00
Michael Niedermayer
660229d647
Revert "Bump minor versions after 3.2 branchpoint to seperate release"
...
this should only have been on master
This reverts commit 1609935b6c .
2016-10-26 21:22:12 +02:00
Michael Niedermayer
32860d2fb8
RELEASE_NOTES: based on 3.1
...
Name suggested by Lou and Kyle
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 21:14:02 +02:00
Michael Niedermayer
7fd15f2939
Update for 3.2
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 21:13:51 +02:00
Michael Niedermayer
1609935b6c
Bump minor versions after 3.2 branchpoint to seperate release
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 20:52:42 +02:00
Michael Niedermayer
e84d587613
Changelog: Add 3.2
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 20:52:42 +02:00
Michael Niedermayer
36ecf30cbc
doc/APIchanges: add 3.2 Cut marker
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 20:52:42 +02:00
Michael Niedermayer
3f3025205f
Bump minor versions for 3.2
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 20:52:42 +02:00
Michael Niedermayer
38e5a4f3bb
Revert "avformat/utils: Discard huge timestamps which would cause overflows if used in basic computations"
...
Some people seem to oppose this the patch seems to have been missed for a month on the ML
lets restart the discussion and solve this after the release
This reverts commit e936c8d176 .
2016-10-26 20:31:04 +02:00
Michael Niedermayer
c92f55847a
avcodec/dvdsubdec: Fix off by 1 error
...
Fixes out of array read
Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 19:50:53 +02:00
Michael Niedermayer
e936c8d176
avformat/utils: Discard huge timestamps which would cause overflows if used in basic computations
...
Allowing larger timestamps makes it impossible to calculate basic things like the
difference of 2 timestamps or their sum without checking each individual computation for
overflow.
This should avoid a significant number of overflow checks
Fixes Ticket5136
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 19:46:00 +02:00
Michael Niedermayer
d88a6bedb9
avformat/isom: Fix old API regression with exporting max bitrate
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 19:46:00 +02:00
Michael Niedermayer
4045a8d73e
doc/patchwork: Document the patchwork states
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 19:46:00 +02:00
Michael Behrisch
c5ac86256b
lavu: remove comma at final enumeration items to fix pedantic warnings
2016-10-26 19:36:09 +02:00
Vodyannikov Aleksandr
9445e7e6d5
swresample/rematrix: Fix float part of swr_set_matrix()
...
Fixes Ticket #5897 .
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 19:27:22 +02:00
Michael Niedermayer
ded5c88528
configure: Remove --enable-incompatible-libav-abi from the help output
...
As it does not work anymore since 655b6dcb34
Found-by: carl
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 19:27:08 +02:00
Michael Niedermayer
25ab1a65f3
avcodec/dvdsubdec: Fix buf_size check
...
Fixes out of array access
Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 18:46:10 +02:00
Michael Niedermayer
20182e79f9
doc/APIchanges: Fill in some missing things
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 03:06:50 +02:00
Suman-
a81494b603
lavf/flvdec: init AVPacket::pos to FLVTAG offset
...
Current code doesn't initialize AVPacket::pos. Made it point to FLVTAG so flv_read_packet can decode from pos
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 02:12:18 +02:00
Tobias Rapp
03a6feb213
fate: Add MXF D10/DNXHD/DV25 probe tests
...
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-26 02:08:52 +02:00
Yogender Gupta
f524275ef9
avfilter/scale_npp: fix passthrough mode
...
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-25 23:17:31 +02:00
Carl Eugen Hoyos
134233972e
lavc/utvideoenc: Set bits_per_coded_sample for rgba.
...
Allows to write correct value for biBitCount into BITMAPINFOHEADER.
Before, ff_put_bmp_header() always wrote "24" as biBitCount
for utvideo because bits_per_coded_sample was never set by the
encoder.
2016-10-25 13:44:08 +02:00
Michael Niedermayer
85d23e5cbc
avcodec/interplayvideo: Check side data size before use
...
Fixes out of array read
Found-by: Thomas Garnier using libFuzzer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-25 04:46:02 +02:00
Michael Niedermayer
c1173437fc
avcodec/ffv1enc: Fix storing RGB48 without explicitly set level
...
the bps value is only stored with level >= 1, using rgb48 with level 0 requires the
user app to keep track of the bps by external means, which does not always happen
also we force level >= 1 for other 16bps formats, so this is consistent.
Found-by: Jerome Martinez <jerome@mediaarea.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-25 02:51:34 +02:00
Vittorio Giovara
ba53d3ae8b
vf_colorspace: Add support for iec61966-2.1 (sRGB) transfer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2016-10-24 16:07:44 -04:00
Ronald S. Bultje
f141ac4d0b
vf_colorspace: don't spam console with warnings if range is unspecified.
2016-10-24 16:03:16 -04:00
Ronald S. Bultje
be885da342
vp9: change order of operations in adapt_prob().
...
This is intended to workaround bug "665 Integer Divide Instruction May
Cause Unpredictable Behavior" on some early AMD CPUs, which causes a
div-by-zero in this codepath, such as reported in Mozilla bug #1293996 .
Note that this isn't guaranteed to fix the bug, since a compiler is free
to reorder instructions that don't depend on each other. However, it
appears to fix the bug in Firefox, and a similar patch was applied to
libvpx also (see Chrome bug #599899 ).
2016-10-24 16:02:39 -04:00
Rodger Combs
490c6bda0e
lavf/mov: reindent
...
Reviewed-By: Michael Niedermayer <michael@niedermayer.cc >
2016-10-24 05:47:10 -05:00
Rodger Combs
697400eac0
lavf/mov: improve tref/chap chapter handling
...
3 parts:
- Supports multiple chapter streams
- Exports regular text chapter streams as opaque data. This prevents consumers
from showing chapters as if they were regular subtitle streams.
- Exports video chapter streams as thumbnails, and provides the first one as
an attached_pic.
2016-10-24 05:47:10 -05:00
Rodger Combs
73ead477dd
lavf: add AV_DISPOSITION_TIMED_THUMBNAILS
...
Reviewed-By: Michael Niedermayer <michael@niedermayer.cc >
2016-10-24 05:47:05 -05:00
Rodger Combs
3b3f979894
fate/hevc: add automatic bsf test
2016-10-24 03:53:25 -05:00
Rodger Combs
ed4e081a36
fate/aac: add automatic bsf test
2016-10-24 03:53:24 -05:00
Rodger Combs
a6da754ef9
fate/h264: make mp4toannexb test use auto-BSF
2016-10-24 03:53:24 -05:00
Rodger Combs
d99d7cbdfc
lavf/rawenc: add automatic bitstream filtering for H264+HEVC
2016-10-24 03:53:24 -05:00
Rodger Combs
42cb050a05
lavf/movenc+dashenc: add automatic bitstream filtering
...
This is disabled by default when the empty_moov flag is enabled
2016-10-24 03:53:23 -05:00
Rodger Combs
c972a28fc3
lavf/dashenc: add deinit function
2016-10-24 03:53:23 -05:00
Rodger Combs
e83d5d7e58
lavf/movenc: add deinit function
2016-10-24 03:53:22 -05:00
Rodger Combs
45f5c55732
lavf/segment: fix writing separate header with auto BSF
2016-10-24 03:53:22 -05:00
Rodger Combs
c7cd6ad850
lavf/segment: add deinit function
2016-10-24 03:53:22 -05:00
Rodger Combs
a246fef163
lavf/mux: add avformat_init_output
...
This allows a consumer to run the muxer's init function without actually
writing the header, which is useful in chained muxers that support
automatic bitstream filtering.
2016-10-24 03:53:21 -05:00
Rodger Combs
8a24e03684
MAINTAINERS: add myself for audiotoolbox
2016-10-24 01:47:52 -05:00
Rodger Combs
54350f06e1
ffprobe: report field order for video streams
2016-10-24 01:24:23 -05:00
Rodger Combs
ba53504e57
lavc/utils: avcodec_string: dump field order when known
2016-10-24 01:24:22 -05:00
Rodger Combs
f271a9bd99
lavc/h264_parser: export field order in more cases
2016-10-24 01:20:18 -05:00
Rodger Combs
d13740f3a2
lavc/parser: export field order if not already set
...
Some codecs set this in the parser, but not the decoder
2016-10-24 01:20:18 -05:00
Clément Bœsch
58672347cb
lavfi: remove 2 unused lavc includes
2016-10-23 20:19:28 +02:00
Michael Niedermayer
051517648b
avutil/x86/emms: Document the emms_c() vs alloc/free relation.
...
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-23 13:02:37 +02:00
Andreas Cadhalpun
2506a7cc09
faq: use relative links to own documentation
...
This way locally installed documentation refers to itself instead of the
website.
Bud-Id: https://bugs.debian.org/841501
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-23 11:55:53 +02:00
Zhou Xiaoyong
89ec4adad6
avcodec/mips: loongson optimize mmi load and store operators
...
1.MMI_ load/store macros are defined in libavutil/mips/mmiutils.h
2.Replace some unnecessary unaligned access with aligned operator
3.The MMI_ load/store is compatible with cpu loongson2e/2f which not support instructions start with gs
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-23 03:23:09 +02:00
Zhou Xiaoyong
b9cd922660
avutil/mips: loongson add mmi utils header file
...
1.mmiutils.h defined MMI_ load/store macros for loongson2e/2f/3a
2.mmiutils.h defined some mmi assembly macors
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-23 03:23:09 +02:00
Carlos Fernandez
728ccae8a2
lavf/mpegts: add missed fixes to scte35 section callback
...
They somehow got lost along the patch versions.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-23 00:10:34 +02:00
Philip Langdale
ee7d6738ca
avcodec/cuvid: Allow reinitialization of decoder
...
In practice, this works fine.
2016-10-22 14:57:00 -07:00
James Almer
cc71fa319f
avformat/matroskaenc: write DisplayWidth and DisplayHeight elements only if they differ from PixelWidth and PixelHeight
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-22 15:00:15 -03:00
Andreas Cadhalpun
178eebd79e
mpegts: handle AVMEDIA_TYPE_UNKNOWN correctly
...
It is negative, so can't be used for left shifting.
This fixes ubsan runtime error: shift exponent -1 is negative
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-22 19:23:12 +02:00
Michael Niedermayer
f5495c970c
avutil/avassert: Add av_assertX_fpu()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-22 13:50:09 +02:00
Michael Niedermayer
2c1d38d1e1
avcodec/snowenc: Clear MMX state after edge drawing and picture encode
...
Fixes undefined behavior from calling libc allocation with unclean FPU state.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-22 13:46:58 +02:00
Michael Niedermayer
de0cd0ffc9
avcodec/mpegvideo_enc: Add missing emms_c() to clear MMX state after SIMD use
...
Fixes undefined behavior due to calling libc allocation with unclean FPU state
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-22 13:46:46 +02:00
Michael Niedermayer
966c5c7bb8
avcodec/utils: Move emms_c() before memory allocation functions in avcodec_encode_video2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-22 13:46:10 +02:00
Michael Niedermayer
493ad519dd
avcodec/cavsdec: Clear MMX state after MB decode loop
...
The MMX state must be cleared between using MMX and using memory allocation
thats basically the only location between the 2
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-22 13:46:05 +02:00
Michael Niedermayer
70dc6bbf1b
avcodec/svq1enc: Clear MMX state after svq1_encode_plane()
...
svq1_encode_plane() uses SIMD and we call libc memory allocation functions after it
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-22 13:45:59 +02:00
Carl Eugen Hoyos
6969bed12c
lavf/rtpdec_g726: Map mime type G726 to g726le.
...
Add new mime types AAL2-G726 for g726 as suggested in rfc 3551.
This patch will break interaction with applications that incorrectly
use big-endian G.726 with mime type G726 but we know of at least one
device (DVTel camera) that correctly implements the rfc, so do the same.
Fixes ticket #5890 .
2016-10-22 03:53:38 +02:00
Kagami Hiiragi
41da4f8cb3
lavc/libvpxenc: fix -auto-alt-ref option type
...
vp9_cx_iface actually allows values in range [0..2].
This fixes ticket #5894 .
Signed-off-by: Kagami Hiiragi <kagami@genshiken.org >
Signed-off-by: James Zern <jzern@google.com >
2016-10-21 18:16:46 -07:00
Andreas Cadhalpun
c8a6eb58d7
doc: fix spelling errors
...
Thanks to Mathieu Malaterre <malat@debian.org > for reporting the
Que/Queue typo. (https://bugs.debian.org/839542 )
Reviewed-by: Lou Logan <lou@lrcd.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-21 23:58:47 +02:00
Carlos Fernandez
5db3c9476c
lavf/mpegts: SCTE-35 extraction from mpegts
...
Reviewed-by: Marton Balint <cus@passwd.hu >
Acked-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Carlos Fernandez <carlos@ccextractor.org >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-21 20:41:19 +02:00
Carlos Fernandez
d53a120ad6
lavc: add SCTE-35 CUI codec ID
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Carlos Fernandez <carlos@ccextractor.org >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-21 20:39:27 +02:00
Marton Balint
dfc561a38e
lavd/decklink_dec: fix indentation
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-21 20:24:12 +02:00
Marton Balint
2f3015c25a
lavd/decklink_dec: add option to disable drawing bars on signal loss
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-21 20:24:12 +02:00
Michael Niedermayer
fecb3e82a4
avformat/mxfdec: Check size to avoid integer overflow in mxf_read_utf16_string()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 20:06:29 +02:00
Michael Niedermayer
c495f4ffde
avformat/mxfdec: Fix mixed declaration and code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 20:06:29 +02:00
Andreas Cadhalpun
a92f8edf0c
mpeg12dec: unref discarded picture from extradata
...
Otherwise another frame gets referenced into picture, triggering an assert
(from commit 13aae8) in av_frame_ref.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-21 19:41:29 +02:00
Andreas Cadhalpun
1966ea012f
cavsdec: unref frame before referencing again
...
This fixes asserts (from commit 13aae8) in av_frame_ref and
av_frame_move_ref.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-21 19:41:15 +02:00
Andreas Cadhalpun
b0a043f51b
dcstr: fix division by zero
...
Also check for possible overflows.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-21 19:41:09 +02:00
Andreas Cadhalpun
93c39db5f1
aiff: check block_align in aiff_read_packet
...
It can be unset in avcodec_parameters_from_context and a value of 0
causes SIGFPE crashes.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-21 19:40:59 +02:00
Steven Liu
4d92bd3ca2
avcodec/vda: define av_vda_default_init2 when CONFIG_H264_VDA_HWACCEL equ 0
...
on OSX:
../configure --disable-everything --enable-demuxer=hls make
error message: Undefined symbols for architecture x86_64:
"_av_vda_default_init2", referenced from:_videotoolbox_init in
ffmpeg_videotoolbox.o
so add av_vda_default_init2 when CONFIG_H264_VDA_HWACCEL=0
Signed-off-by: Steven Liu <lq@chinaffmpeg.org >
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Reviewed-by: Xidorn Quan <quanxunzhen@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 16:54:25 +02:00
Hiroyuki OYAMA
47f74df29c
avformat/rtmpproto: Fix RTMP control message handling error in listen mode.
...
Fix problem to fail by a RTMP Control Message except "Set Chunk Size (1)" after an RTMP handshake. When 'nginx-rtmp-module' relays an RTMP, it sends not only control message 'Set Chunk Size (1)' but also 'Window Acknowledgement Size (5)'.
Reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 16:16:32 +02:00
Michael Niedermayer
03ec6b780c
avcodec/mpegvideo_enc: Clear mmx state in ff_mpv_reallocate_putbitbuffer()
...
This function must be called from the mb or slice encoding loop and MMX state may not
be clean there
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 14:17:50 +02:00
Michael Niedermayer
4f96f9d111
avcodec/utils: Clear MMX state before returning from avcodec_default_execute*()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 14:17:50 +02:00
Michael Niedermayer
6c5b98d40b
avcodec/dnxhdenc: Move allocation out of radix_sort()
...
Its slow, its not checked, FPU state is not clean either currently there
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 14:17:50 +02:00
Rodger Combs
ecb53e1101
lavf/segment: decide whether to rename based on list URI
...
This fixes the case of writing segments to local files, but the list
over a network protocol.
2016-10-21 01:43:59 -05:00
Matt Oliver
798c6ecce5
openssl: Support version 1.1.0.
...
Fixes #5675
Signed-off-by: Matt Oliver <protogonoi@gmail.com >
2016-10-21 15:16:44 +11:00
Mark Reid
0cfd6ccede
tests/fate: add mxf metadata streams test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 02:04:21 +02:00
Mark Reid
6902e1c7fa
libavformat/mxfdec: add metadata streams for external referenced sourclips
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 02:04:19 +02:00
Mark Reid
263f8fd7e5
libavformat/mxfdec: don't assume first stream index to be primary
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 02:04:16 +02:00
Mark Reid
3b82be9e3b
libavformat/mxfdec: export track name metadata
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 02:04:01 +02:00
Tobias Rapp
e3196b6862
avformat/mxfdec: Detect field_order based on video_line_map
...
Read video_line_map from MXF generic picture essence descriptor and use
it to derive the coded field order. Use field_dominance to derive the
display field order from coded field order. If field_dominance is not
available the default value "1" is used as defined in SMPTE S377-1.
Fixes field_order detection for a bunch of DV/DVCPRO files. The heuristic
for deriving coded field order from video_line_map is inspired by
MediaInfo.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-21 02:00:56 +02:00
Andreas Cadhalpun
ee5f0f1d35
rsd: limit number of channels
...
Negative values don't make sense and too large values can cause
overflows. For AV_CODEC_ID_ADPCM_THP this leads to a too small extradata
buffer being allocated, causing out-of-bounds writes.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-20 19:54:54 +02:00
Hendrik Leppkes
8bd38ec5bd
dxva2: fix surface selection when compiled with both d3d11va and dxva2
...
Fixes a regression introduced in 9b462a0b9
2016-10-20 19:31:34 +02:00
Steven Liu
5702416c57
avformat/flvenc: do not attempt to write duration and filesize when not seekable
...
Its impossible to update the filesize & duration values if seekback is not
possible as with live streams
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-20 18:07:24 +02:00
Carl Eugen Hoyos
c0e2846dcd
lavc/sheervideo: Increase av_get_codec_tag_string() input buffer size.
...
A size of 32 is typically used.
2016-10-20 09:55:52 +02:00
Muhammad Faiz
258c49d614
avfilter/firequalizer: use zero phase kernel
...
this makes real-valued kernel
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-20 14:10:53 +07:00
Muhammad Faiz
56689a46b3
avfilter/showcqt: add cscheme option
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-20 14:10:43 +07:00
Carl Eugen Hoyos
d8716864f9
lavf/riff: Document the interleaving of VSM4 video.
2016-10-19 23:39:19 +02:00
Andreas Cadhalpun
a5b4476a60
avformat: prevent triggering request_probe assert in ff_read_packet
...
If probe_codec is called with pkt == NULL, it sets probe_packets to 0
and request_probe to -1.
However, request_probe can change when calling s->iformat->read_packet
and thus a probe_packets value of 0 doesn't guarantee a request_probe
value of -1.
In that case calling probe_codec again is necessary to prevent
triggering the assert.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-19 23:13:28 +02:00
Derek Buitenhuis
dfe7e5501d
FATE: Add test for muxing discontinuous MP4 fragments with large timestamps
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-10-19 13:25:21 +02:00
Michael Niedermayer
18ad44d145
avformat/movenc: Skip duration check for discontinuous fragments
...
Found-by: Daemon404
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-19 13:25:21 +02:00
Jean Caillé
6498549fd7
lavf/mov: support gopro hero moments udta tag
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-19 13:25:21 +02:00
Sven C. Dack
1aa8fa418a
avfilter/vf_scale_npp: select cubic and lanczos as alternative where super-sampling is not supported
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-10-19 12:51:59 +02:00
Sven C. Dack
aebbcb2706
avcodec/nvenc_hevc: Added missing option -temporal_aq
...
The option is present in h264_nvenc, but was missing from hevc_nvenc.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-10-19 12:45:52 +02:00
Sven C. Dack
da4d0fa86b
avcodec/nvenc: add test for Temporal AQ support
...
Adds a check to see if the hardware supports temporal aq.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-10-19 12:41:41 +02:00
Matthieu Bouron
d5082a2ce7
lavc/mediacodec: use more meaningful filenames
...
Adds the following changes:
* mediacodecdec.{c,h} -> mediacodecdec_common.{c,h}
* mediacodecdec_h2645.c -> mediacodecdec.c
2016-10-19 10:50:56 +02:00
Matthieu Bouron
f62c54456d
lavc: add mpeg4 mediacodec decoder
2016-10-19 10:50:52 +02:00
Matthieu Bouron
0f7fce87ea
lavc: add vp8/vp9 mediacodec decoders
2016-10-19 10:50:12 +02:00
Matthieu Bouron
b8c158a4ed
lavc/mediacodec_wrapper: do not discard codecs reporting they do not support any profile
...
Depending on the device, some (VP8/VP9/...) decoders report that they do
not support any profiles.
2016-10-19 09:52:15 +02:00
Muhammad Faiz
23b6f880d6
avfilter/firequalizer: add cubic_interpolate function on gain
...
smoother version of gain_interpolate
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-19 14:05:46 +07:00
James Almer
0ad71ed6f9
avformat/matroskadec: fix BitsPerChannel element's default value
...
The element is currently ignored, so there's no effective functionality
change with this.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-18 23:55:32 -03:00
James Almer
f5cfc0cc54
avformat/matroskadec: clarify some Colour element defaults using enum values
...
This way it's more clear what the default values refer to, as
Undetermined/Unspecified is 0 for some, 2 for others.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-18 23:55:05 -03:00
James Almer
ea201ad14c
avformat/mov: pass the demuxer's AVFormatContext to avpriv_request_sample()
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-18 23:09:02 -03:00
Aman Gupta
f45d5e07dd
lavc/videotoolboxenc: skip SEI allocation when side data is not present
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-10-18 19:51:42 -04:00
James Almer
47ee6f1a59
avformat/matroskadec: support parsing Chroma Location elements
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-18 20:39:07 -03:00
Rostislav Pehlivanov
d2ae5f77c6
aacenc: add SIMD optimizations for abs_pow34 and quantization
...
Performance improvements:
quant_bands:
with: 681 decicycles in quant_bands, 8388453 runs, 155 skips
without: 1190 decicycles in quant_bands, 8388386 runs, 222 skips
Around 42% for the function
Twoloop coder:
abs_pow34:
with/without: 7.82s/8.17s
Around 4% for the entire encoder
Both:
with/without: 7.15s/8.17s
Around 12% for the entire encoder
Fast coder:
abs_pow34:
with/without: 3.40s/3.77s
Around 10% for the entire encoder
Both:
with/without: 3.02s/3.77s
Around 20% faster for the entire encoder
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Tested-by: Michael Niedermayer <michael@niedermayer.cc >
Reviewed-by: James Almer <jamrial@gmail.com >
2016-10-18 21:41:18 +01:00
Jon Toohill
3b02f6dd7b
lavf/mp3enc: write encoder delay/padding upon closing
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-18 20:19:43 +02:00
Jon Toohill
81f4f789de
lavc/libmp3lame: send encoder delay/padding in packet side data
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-18 20:19:29 +02:00
Muhammad Faiz
d3be186ed1
avfilter/firequalizer: add dumpfile and dumpscale option
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-18 22:41:43 +07:00
Muhammad Faiz
acd74f9200
swresample/resample: fix return value of build_filter
...
return AVERROR code on error
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-18 22:36:01 +07:00
Michael Niedermayer
9545ff3ec3
avcodec/mediacodec: Factor duplicate include
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-18 15:32:14 +02:00
Michael Niedermayer
2bd9956454
doc/examples/demuxing_decoding: Drop AVFrame->pts use
...
This code is not correct for git master
Reviewed-by: Stefano Sabatini <stefasab@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-18 15:15:12 +02:00
Carl Eugen Hoyos
31a0a84216
lavf/avidec: Be more verbose when ignoring very large tag size.
2016-10-18 15:01:50 +02:00
Muhammad Faiz
2c1be03cb3
fate: add swr-convertaudio test
...
test for flt to s16
should pass on correct rounding to nearest
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-18 14:45:07 +07:00
Zhao Zhili
7853d838a6
avformat/tests/gitignore: add fifo_muxer entry
...
Reviewed-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-18 03:38:37 +02:00
Carl Eugen Hoyos
a20f3238be
lavf/avidec: Do not fail for very large idx1 tags.
...
Fixes demuxing the sample file from github pull request 197,
the size of its idx1 tag is 6171936 bytes, followed by a JUNK
tag of 9505704 bytes.
2016-10-18 00:25:41 +02:00
Andreas Cadhalpun
bc7e128a6e
westwood_aud: prevent division by zero
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-17 20:42:18 +02:00
Andreas Cadhalpun
9959a52b14
astdec: fix division by zero
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-17 20:41:26 +02:00
Muhammad Faiz
923488bdaa
avfilter/showcqt: add font option
...
this is fontconfig pattern
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-18 00:47:57 +07:00
Muhammad Faiz
92de89d14a
avfilter/firequalizer: optimize gain/gain_entry command
...
do not rebuild when gain/gain_entry command are
equal with old gain/gain_entry
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-18 00:47:42 +07:00
Carl Eugen Hoyos
df9b151a1b
doc: Update x264 option a53cc, forgotten in 93e04102.
2016-10-17 19:11:18 +02:00
Andreas Cadhalpun
c143a9c96f
aiffdec: fix division by zero
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-17 18:24:48 +02:00
Carl Eugen Hoyos
f04c27fe7c
lavc/videotoolboxenc: Enable a53cc by default.
2016-10-17 17:50:29 +02:00
Andreas Cadhalpun
eb751f06db
matroskadec: fix NULL pointer dereference
...
The problem was introduced in commit 1273bc6 .
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-17 15:50:26 +02:00
Rick Kern
d3874b74f3
lavc/videotoolboxenc: Error log formatting.
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-10-17 08:58:17 -04:00
Rick Kern
9875695e2c
lavc/videotoolboxenc: Update a53cc handling
...
Handles insertion into existing SEI NAL unit, inserts emulation
prevention bytes.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-10-17 08:58:17 -04:00
Rick Kern
aa413b810a
lavc/videotoolboxenc: flush/free frames on close
...
Prevents encode callback from running after codec is closed.
Fixes a crash when an error is returned.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-10-17 08:58:17 -04:00
Aman Gupta
9ea91e4114
lavc/videotoolboxenc: implement a53cc
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-10-17 08:58:17 -04:00
Hendrik Leppkes
656feb641d
mov: move stsd finalization to an appropriate place
...
mov_finalize_stsd_codec parses stream information from the ALAC extradata,
so run it after the extradata processing is completed in mov_read_stsd.
Fixes playback of 96kHz ALAC streams muxed by qaac or the reference alac encoder.
Fixes trac ticket #5826
2016-10-17 12:49:36 +02:00
Muhammad Faiz
1a9513bfbc
avfilter/firequalizer: add scale option
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-17 03:17:50 +07:00
Clément Bœsch
ad2d2ebd4e
ffmpeg: remove unused ist parameter in do_subtitle_out()
2016-10-16 19:22:19 +02:00
James Almer
8b59ce0342
Partially revert "avformat/matroskadec: set aspect ratio only when DisplayWidth and DisplayHeight are in pixels"
...
The code works just fine regardless of unit, so only make sure DisplayUnit
is not "unknown".
Found-by: Nicolas George <george@nsup.org >
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-16 14:19:05 -03:00
James Almer
4b0f37dadb
avcodec/utils: print Chroma Location string in verbose log level
...
It's container level information on some formats (Matroska, MXF, yuv4mpeg), so
it should be printed at higher log levels than debug.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-16 12:18:39 -03:00
James Almer
90826031a2
avformat/matroskaenc: write a DisplayUnit element when aspect ratio is unknown
...
We don't currently support values 1 (centimeters), 2 (inches) or 3 (DAR),
only the default value 0 (pixels) which doesn't need to be written.
The fate refs are updated as unknown SAR is now signaled in the output
files with the addition of the new element.
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-15 20:48:03 -03:00
James Almer
bad8bbc26a
avformat/matroskadec: set aspect ratio only when DisplayWidth and DisplayHeight are in pixels
...
A missing DisplayUnit element or one with the default value of 0 means
DisplayWidth and DisplayHeight should be interpreted as pixels.
The current code setting st->sample_aspect_ratio is wrong when DisplayUnit
is anything else.
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-15 20:42:07 -03:00
Muhammad Faiz
8e53c1567c
doc/filters: document tukey window on firequalizer
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-16 05:54:34 +07:00
Muhammad Faiz
01ab60201b
avfilter/firequalizer: add tukey window
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-16 05:50:47 +07:00
Muhammad Faiz
7c5fca15bb
avfilter/firequalizer: change WFUNC_MIN/MAX to NB_WFUNC
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-16 05:48:36 +07:00
Muhammad Faiz
a11757d7cb
avfilter/showcqt: add csp option
...
from colorspace filter
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-16 05:41:09 +07:00
Jean Caillé
4599e11651
lavf/mov: support gopro firmware udta tag
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-15 00:59:08 +02:00
Thomas Turner
09d39177dc
avutil: Improved selftest coverage for libavutil/fifo.c
...
Tested functions: av_fifo_generic_peek(), av_fifo_grow()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-14 23:14:33 +02:00
Michael Niedermayer
d790e48830
avutil/audio_fifo: Use av_fifo_freep() and remove redundant if()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-14 17:08:51 +02:00
Michael Niedermayer
44453c09e4
ffmpeg: Use av_fifo_freep() to avoid stale pointers
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-14 17:05:25 +02:00
James Zern
7f7c494a33
ffmpeg_cleanup: fix crash with unrecognized codec
...
since:
3e5e5bd Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'
Signed-off-by: James Zern <jzern@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-14 17:02:33 +02:00
Andreas Cadhalpun
56706ac0d5
libopenjpegenc: fix out-of-bounds reads when filling the edges
...
The calculation of width/height should round up, not round down to
prevent setting width or height to 0.
Also image->comps[compno].w is unsigned (at least in openjpeg2), so the
calculation could silently wrap around without the explicit cast to int.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-14 16:56:14 +02:00
Andreas Cadhalpun
69c8505f3b
libopenjpegenc: stop reusing image data buffer for openjpeg 2
...
openjpeg 2 sets the data pointers of the image components to NULL,
causing segfaults if the image is reused.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-14 16:55:45 +02:00
Carl Eugen Hoyos
a2c5f5aacf
configure: Enable pie for toolchain=hardened.
2016-10-14 14:56:40 +02:00
Marton Balint
7845c13881
lavfi/sidedata: add filter for manipulating frame side data
...
This is a similar filter to f_metadata, only it works on side data. Since
adding side data from a user provided arbitrary binary string is unsafe,
because current code assumes that a side data of a certain kind has the proper
size, this filter only implements selection and deletion. Also, no value
matching support is implemented yet, because there is no uniform way to specify
a side data textually.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-13 23:01:53 +02:00
Andreas Cadhalpun
7a65aef00d
configure: fix detection of libopenjpeg
...
Use check_lib2 to test the header together with the function. This is
necessary, because '-DOPJ_STATIC' changes what the included header does.
Also add '-DOPJ_STATIC' to CPPFLAGS, so that it isn't necessary to
hardcode this in libavcodec/libopenjpeg{dec,enc}.c.
Finally, check for non-static openjpeg 2.1, too.
Reviewed-by: Michael Bradshaw <mjbshaw@gmail.com >
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
2016-10-13 21:04:19 +02:00
Muhammad Faiz
c593a70cda
fate: add test for firequalizer filter
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-14 01:46:37 +07:00
Stefano Sabatini
23f0f1537e
doc/demuxers: restore alphabetical order
2016-10-13 19:37:47 +02:00
James Almer
1273bc6d26
avformat/matroskadec: workaround the field_order bug in the Matroska muxer
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-13 14:22:07 -03:00
Vicente Olivert Riera
04b0792e4a
libavcodec/mips/h264dsp_msa.c: fix type in some function parameters
...
This fixes a build problem for MIPS architecture that looks like this:
libavcodec/mips/h264dsp_msa.c:2498:6: error: conflicting types for
‘ff_weight_h264_pixels16_8_msa’
void ff_weight_h264_pixels16_8_msa(uint8_t *src, int stride,
This bug was introduced by commit bc26fe8927 :
avcodec/h264: Use ptrdiff_t for (bi)weight functions
That commit changed the data type of some function parameters in some
function definitions. However, the implementation of those functions in
libavcodec/mips/h264dsp_msa.c wasn't changed accordingly.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-13 19:15:48 +02:00
Carl Eugen Hoyos
4d81f9631d
lavf/riff: Support Verint NetDVR II ("VSM4") h263 video in asf.
2016-10-13 12:17:48 +02:00
James Almer
7cf0ed32fa
avformat: bump minor version after the Matroska field order enum fix
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-12 19:40:42 -03:00
James Almer
dc781459cc
avformat/matroska: fix MatroskaVideoFieldOrder enum values
...
The spec says
9: Interlaced with bottom field displayed first and top field stored first
14: Interlaced with top field displayed first and bottom field stored first
And avcodec.h states
AV_FIELD_TB, //< Top coded first, bottom displayed first
AV_FIELD_BT, //< Bottom coded first, top displayed first
Reviewed-by: Dave Rice <dave@dericed.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-12 18:26:22 -03:00
Carl Eugen Hoyos
932bbfc5d8
configure: Use LDEXEFLAGS in check_ld().
...
Avoids detecting libraries that are not compatible with ldexeflags.
2016-10-12 22:59:10 +02:00
Timo Rothenpieler
30c5587503
avcodec/nvenc: add support for forcing intra/idr frames
2016-10-12 20:51:43 +02:00
Philip Langdale
03d6d5f376
crystalhd: Use mpeg4_unpack_bframes to avoid buggy crystalhd handling
...
The hardware handling of packed bframes was always questionable but
it used to ok with my workaround. Today, not so much. But today we
have a bsf to unpack the bframes, so let's just use that and be
done with it.
2016-10-12 07:44:09 -07:00
Philip Langdale
b5f45208fb
crystalhd: Fix handling of PTS
...
With all the various refactorings that have happened over the years,
the current pts logic is very broken for non-trivial cases (ie: ones
where not every frame/field has a meaningful pts assocated with it).
Generally, we do not want to write AV_NOPTS_VALUE as the output
timestamp, regardless of anything else. It's better to pass zero
if there's no other information.
Additionally, interlaced content where the decoder returns each field
separately can result in the first field carrying the timestamp and
the second having AV_NOPTS_VALUE. It's clearly wrong to overwrite
the valid timestamp.
So, let's just never write AV_NOPTS_VALUE into an output frame.
Empirically, this fixed playback of interlaced mpeg2 and h.264 and
mpeg4-asp with packed b-frames in an avi container.
2016-10-12 07:44:09 -07:00
Carl Eugen Hoyos
fe8959bbec
lavf/riffenc: Always write unexpected channel_mask.
...
Allows to write arbitrary channel masks also for 16bit 48kHz pcm.
2016-10-12 12:34:48 +02:00
Rostislav Pehlivanov
230178dfe2
aacenc: use the decoder's lcg PRNG
...
Using lfg was an overkill in this case where the random numbers
were only used for encoder descisions. Should increase result
uniformity between different FPUs and gives a slight speedup.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-10-12 11:15:49 +01:00
Matthieu Bouron
cfa3c2655a
lavc/mediacodecdec: rename dequeued_buffer_nb to output_buffer_count
2016-10-12 09:50:42 +02:00
Matthieu Bouron
a458ed65b5
lavc/mediacodecdec: remove first output buffer timing debug log
2016-10-12 09:50:42 +02:00
James Almer
8063978bfc
avformat/matroskaenc: don't write a FlagInterlaced element if it would write the default value
...
The spec says:
"Mandatory elements with a default value may be left out of the file. In the absence
of a mandatory element, the element's default value is used."
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-11 19:49:19 -03:00
Michael Niedermayer
51f3278089
doc/developer: Mention mime type and patchwork in "Submitting patches"
...
Suggested-by: ronald
Reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-11 23:20:56 +02:00
Marton Balint
24022402be
lavfi/metadata: fix metadata deletion if comparison returns false
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-11 18:05:28 +02:00
Moritz Barsnick
99d68d462f
doc: fix various typos and grammar errors
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-11 16:57:46 +02:00
Carl Eugen Hoyos
5781256c01
lavf/matroskaenc: Always write V_QUICKTIME extradata.
...
Fixes ticket #5872 .
2016-10-11 10:07:18 +02:00
Carl Eugen Hoyos
34aa145468
lavf/aiffenc: Write extradata also for qcelp.
...
Fixes ticket #4009 .
2016-10-11 09:52:34 +02:00
Carl Eugen Hoyos
4147d8efe5
lavf/aiffdec: Default to full rate qcelp as QT does.
...
Fixes decoding of the output file from ticket #4009 .
2016-10-11 09:49:35 +02:00
Carl Eugen Hoyos
d0c1b9821a
lavf/mxfenc: Do not print a useless error message.
...
The option d10_channelcount only exists for mxf_d10.
2016-10-11 09:45:37 +02:00
James Almer
c44eae157f
avformat/matroskaenc: fix targets for attachment tags
...
Attachment tags were being written targeting non-existent streams in the
output file.
Also filter filename and mimetype entries, as they are standard elements
in the Attachment master.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-10 23:18:36 -03:00
Moritz Barsnick
efbc37a757
lavfi/pan: renormalize negative gain coefficients properly
...
The parser for the outdef will accept a negative value for the first
named channel's gain. As negative values effectively only invert the
phase of the signal, and not negate the level, the gains' absolute
values must be used to correctly accumulate the levels.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-11 03:27:59 +02:00
Zhou Xiaoyong
50eee357eb
configure: loongson disable mipsfpu and mipsdsp optimizations
...
The optimizations of mipsdsp are not supported by all loongson cpu.
The optimizations of mipsfpu and mipsdspr2 maybe supported by 3A2000/3A3000/3A4000 but not tested yet.
Loongson only support mmi (loongSIMD) optimizations now.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-10 16:05:27 +02:00
Steve Lhomme
9b462a0b9d
avcodec/d3d11va: use the proper slice index
...
The slice index expected by D3D11VA is the one from the texture not from the
array or texture/slices.
In VLC the slices we provide the decoder don't start from 0 and thus pictures
appear in bogus order. With possible crashes and corruptions when using an
invalid index.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-10 16:05:14 +02:00
Michael Niedermayer
1bda0ee530
avutil/hwcontext_vdpau: Fix warning: "GET_CALLBACK" redefined
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-10 02:41:24 +02:00
Michael Niedermayer
ed2112fb36
avformat/movenc: Check frame rate in mov_write_uuidprof_tag()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-10 00:58:16 +02:00
Michael Niedermayer
21bffa93a6
avformat/movenc: Switch mov_write_uuidprof_tag() to avg_frame_rate
...
Using the stream timebase simply overflows
Fix integer overflow in psp framerate computation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-10 00:58:16 +02:00
Michael Niedermayer
987690799d
avformat/utils: Update codec_id before using it in the parser init
...
Fixes assertion failure
Fixes: input.avi
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-10 00:58:16 +02:00
Muhammad Faiz
47d2be3056
avfilter/firequalizer: fix blackman window calculation
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-10-10 02:27:31 +07:00
Moritz Barsnick
3e5d27d7a7
cmdutils: fix typos
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-09 20:09:00 +02:00
Moritz Barsnick
468c596a31
lavf: fix typos
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-09 20:09:00 +02:00
Moritz Barsnick
f4e4bde1f4
lavfi: fix typos
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-09 20:09:00 +02:00
Moritz Barsnick
3305f71025
lavc: fix typos
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-09 20:09:00 +02:00
Moritz Barsnick
f71c98ee12
tools: fix grammar error
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-09 20:09:00 +02:00
Michael Niedermayer
7ba7b96dd3
doc/examples/http_multiclient: Fix "doc/examples/http_multiclient.c:43:9: warning: passing argument 4 of av_opt_get from incompatible pointer type"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-09 00:32:39 +02:00
Hendrik Leppkes
3e5e5bdfef
Merge commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc'
...
* commit '398f015f077c6a2406deffd9e37ff34b9c7bb3bc':
avconv: buffer the packets written while the muxer is not initialized
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-08 11:38:47 +02:00
James Almer
c45ba265fc
avformat/matroskaenc: fix Tags master on seekable output if there are tags after the last stream duration
...
The dynamic AVIOContext would get closed pointing to the wrong position
in the buffer.
This is a regression since 650e17d88b .
Reviewed-by: Dave Rice <dave@dericed.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-07 16:46:45 -03:00
Michael Niedermayer
72061177f3
ffmpeg: Fix bitstream typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-07 16:10:10 +02:00
Hendrik Leppkes
ab7e83efed
ffmpeg: explicitly write headers for files with no streams
...
Recent changes to ffmpeg.c tied output file init to stream init, which broke
stream-less files, specifically ffmetadata output.
2016-10-07 16:02:14 +02:00
Michael Niedermayer
572f16e100
avformat/matroskaenc: Fix () error
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-07 14:56:53 +02:00
Hendrik Leppkes
82c4d57553
Merge commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527'
...
* commit '1c169782cae6c5c430ff62e7d7272dc9d0e8d527':
avconv: explicitly postpone writing the header until all streams are initialized
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 14:39:00 +02:00
Hendrik Leppkes
adfcf16f76
Merge commit '5b63b15663d31f50ce45d980b904a68795ad3f7a'
...
* commit '5b63b15663d31f50ce45d980b904a68795ad3f7a':
lavfi: set the link hwframes context before configuring the dst input
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:29:11 +02:00
Hendrik Leppkes
85146dfc23
Merge commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af'
...
* commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af':
omx: Don't return > 0 from omx_encode_frame
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:28:53 +02:00
Hendrik Leppkes
edb4c44511
Merge commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4'
...
* commit '31aa5335c390c83a6c3ea955b155067c36c4a2c4':
libopenh264enc: Fix inconsistent whitespace
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:23:49 +02:00
Hendrik Leppkes
2335e189fb
Merge commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad'
...
* commit '4f98bb7b6d0323d9ecc3bebd6e24d46a3a374bad':
msmpeg4: Remove commented-out debug logging code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:23:38 +02:00
Hendrik Leppkes
5114c62902
Merge commit 'eedbeb4c2737f28844157fae4bd87ed42a61bb1d'
...
* commit 'eedbeb4c2737f28844157fae4bd87ed42a61bb1d':
msmpeg4: Remove some broken, commented-out cruft
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:22:25 +02:00
Hendrik Leppkes
da76175d68
Merge commit '3c84eaae9da0dc450ae99c65bb6b9865e3ba7fad'
...
* commit '3c84eaae9da0dc450ae99c65bb6b9865e3ba7fad':
h264: Eliminate unused but set variable
Noop, the variable doesn't exist in our code.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:21:51 +02:00
Hendrik Leppkes
8dd0e3d50f
Merge commit '4dbfcd07570a9e45e9597561023adb6da26f27f6'
...
* commit '4dbfcd07570a9e45e9597561023adb6da26f27f6':
librtmp: Avoid an infiniloop setting connection arguments
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:20:04 +02:00
Hendrik Leppkes
e8487d71be
Merge commit 'fe498ef5144d3712b887f44a0c5e654add99ead7'
...
* commit 'fe498ef5144d3712b887f44a0c5e654add99ead7':
hwcontext_vaapi: Return all formats for constraints without config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:19:53 +02:00
Hendrik Leppkes
5e872d9083
Merge commit '11b8030309ee93d79b3a6cd4b83bf00757db1598'
...
* commit '11b8030309ee93d79b3a6cd4b83bf00757db1598':
vaapi_encode: Fix fallback when input does not match any format
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:19:32 +02:00
Hendrik Leppkes
40b2878ad3
Merge commit '8c3c7b8920033d61c7aa15a4465b759c84e5958f'
...
* commit '8c3c7b8920033d61c7aa15a4465b759c84e5958f':
dxva2_h264: Remove an unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:19:06 +02:00
Hendrik Leppkes
6fc74934de
Merge commit 'dc7501e524dc3270335749302c7aa449973625f3'
...
* commit 'dc7501e524dc3270335749302c7aa449973625f3':
checkasm: Issue emms after benchmarking functions
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:18:05 +02:00
Hendrik Leppkes
6f74e3cde6
Merge commit 'beb62dac629603eb074a44c44389c230b5caac7c'
...
* commit 'beb62dac629603eb074a44c44389c230b5caac7c':
Use AVFrame.pts instead of deprecated pkt_pts.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:16:36 +02:00
Hendrik Leppkes
3f9137c57d
Merge commit '32c8359093d1ff4f45ed19518b449b3ac3769d27'
...
* commit '32c8359093d1ff4f45ed19518b449b3ac3769d27':
lavc: export the timestamps when decoding in AVFrame.pts
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-07 13:03:36 +02:00
Hendrik Leppkes
04a3577263
ffmpeg: remove unused and errorneous AVFrame timestamp check
...
Decoders have previously not used AVFrame.pts, and with the upcoming
deprecation of pkt_pts (in favor of pts), this would lead to an errorneous
interpration of timestamps.
2016-10-07 12:21:18 +02:00
Rodger Combs
0212867202
tests: add -nostdin flag when calling ffmpeg
...
This fixes a long-standing issue where running FATE in parallel could result
in the terminal being left misconfigured, particularly if a test failed or
was canceled wtih ^C.
2016-10-06 18:31:07 -05:00
Rodger Combs
1f7d586052
ffmpeg: don't reconfigure terminal if we're not taking input from stdin
2016-10-06 18:31:06 -05:00
James Almer
711bfb33df
avformat/matroskaenc: add an option to disable writting CRC32 elements
...
Also add missing Changelog entry.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 18:42:10 -03:00
James Almer
3bcadf8227
avformat/matroskaenc: write a CRC32 element on Info
...
Finishes implementing ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:16:12 -03:00
James Almer
650e17d88b
avformat/matroskaenc: write a CRC32 element on Tags
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:13:59 -03:00
James Almer
4687240d52
avformat/matroskaenc: write a CRC32 element on Attachments
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:10:51 -03:00
James Almer
eccefece61
avformat/matroskaenc: write a CRC32 element on Chapters
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:08:14 -03:00
James Almer
87ce2595de
avformat/matroskaenc: write a CRC32 element on Tracks
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:05:03 -03:00
James Almer
79248795d4
avformat/matroskaenc: write a CRC32 element on Cues
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 17:01:20 -03:00
James Almer
3b189fae73
avformat/matroskaenc: write a CRC32 element on SeekHead
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:59:09 -03:00
James Almer
6724525a15
avformat/matroskaenc: write a CRC32 element on each Cluster
...
Implements part of ticket #4347
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:54:07 -03:00
James Almer
4e3bdf729a
avformat/matroskaenc: always use a dynamic buffer when writting clusters
...
Tested-by: Dave Rice <dave@dericed.com >
Tested-by: Jerome Martinez <jerome@mediaarea.net >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:30:56 -03:00
James Almer
d41aeea8a6
avformat/matroskaenc: print debug message with cluster offsets only if the output is seekable
...
Printing the dynamic buffer offset is useless.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 16:30:56 -03:00
James Almer
a4044498f7
avformat/matroskadec: check for more reserved values on some Colour elements
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 13:49:29 -03:00
James Almer
9b8ac526f6
avformat/matroskaenc: don't write an empty Colour master element
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-06 13:49:10 -03:00
Carl Eugen Hoyos
d2af93ac16
configure: Also try -mstack-alignment for clang,
...
Fixes stack alignment on x86_32 FreeBSD.
Fixes ticket #5231 .
2016-10-06 18:44:29 +02:00
Matthieu Bouron
0919151651
lavc/mediacodecdec: fix size variable shadowing in ff_mediacodec_dec_decode
...
Fixes incompatible pointer type warning on 64-bit systems.
2016-10-06 16:49:28 +02:00
Nablet Developer
8d858674fd
avcodec/qsvenc_h264: fix segfault when a53 SEI is not available
...
Signed-off-by: Nablet Developer <sdk@nablet.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-06 14:01:40 +02:00
Rodger Combs
a6bce3ca90
lavf/utils: avoid using programs for duration when there's only one
...
This allows us to be more selective about the streams we derive durations from
(specifically, ignoring text streams with outlier end times) in the common case
2016-10-06 01:36:05 -05:00
Rodger Combs
4c9c4fe8b2
lavf/utils: ignore outlier subtitle and data stream end times as well
2016-10-06 01:36:05 -05:00
Timothy Gu
54220ce731
pixfmt: Use enum assignment for aliases
...
This way, Doxygen is happier as aliases are now grouped together, and
it never handled #define's in an enum well in the first place.
Y400A already exists as an enum assignment.
2016-10-05 17:17:50 -07:00
Timothy Gu
bdcd586c0d
pixdesc: Order function prototypes semantically
2016-10-05 17:17:50 -07:00
Shivraj Patil
c1cc13cd2a
avutil/mips/generic_macros_msa: rename macro variable which causes segfault for mips r6
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-05 23:44:03 +02:00
Florian Diemer
db4c1bee96
avformat/riffenc: added possibility to set first to ninth audio language for RIFF taged files (e.g. avi files)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-05 23:38:21 +02:00
Burt P
2c3d936487
af_hdcd: disable auto-convert by default
...
As all known valid HDCD sample formats and sample rates are now handled
by the filter, remove the scan that "invades the privacy" of the filter graph
and turn off autoconvert by default as requested by Nicolas George.
http://ffmpeg.org/pipermail/ffmpeg-devel/2016-August/197571.html
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:52:56 -05:00
Burt P
f51ddbf83c
af_hdcd: add experimental 20 and 24-bit decoding support
...
I don't have any legitimate 20 or 24-bit HDCD to test. It is known
that the PM Model Two would insert packets into 20 and 24-bit output,
but I have no idea what differences in behavior existed when decoding
20 or 24-bit. For now, as with 16-bit, PE (if enabled) will expand the
top 3dB into 9dB and LLE (gain adjust) will be applied if signaled.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:48:59 -05:00
Burt P
4f94f01414
af_hdcd: hdcd_scan() and hdcd_integrate() handle stereo and single channel
...
New versions of hdcd_scan() and hdcd_integrate() that also do the
work of hdcd_scan_stereo() and hdcd_integrate_stereo().
Some code split into previously separate functions to remove
duplication is now merged back into each function in the single
place where it is used.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:39:52 -05:00
Burt P
80d89c1960
af_hdcd: support s16p (WavPack) directly
...
The buffer is already being copied anyway, so interlace the planar
format during the copy and remove one use of auto-convert.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:38:26 -05:00
Burt P
7e46bb80ef
af_hdcd: allow all HDCD sample rates
...
The PM Model Two could output HDCD-encoded audio in CD and all
DVD-Audio sample rates. (44100, 48000, 88200, 96000, 176400, and
192000 Hz)
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:37:55 -05:00
Burt P
de9b23ac1f
af_hdcd: add mono as a supported channel layout
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-10-05 12:37:22 -05:00
Philip Langdale
e5bbedff82
ChangeLog: Add latest CUVID changes
2016-10-05 08:28:21 -07:00
Carl Eugen Hoyos
beb877bae0
lavc/tiff: Print compression debug information.
2016-10-05 13:49:17 +02:00
wm4
40fbf32042
lavc: set best effort timestamp if unset when using new decode API
...
Some API users (in particular ffmpeg.c) check the best effort timestamp
only.
2016-10-05 11:35:54 +02:00
Josh de Kock
5173ffb27f
doc/developer: remove duplicate policies and fix error
...
Fixes regression as of ee72b6d1
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-04 22:55:44 -03:00
James Almer
b33369b612
avformat/matroskaenc: don't reserve space for stream duration tags if the output is not seekable
...
The durations are never written in that situation.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-04 21:19:58 -03:00
James Almer
3cc9d6d382
avformat/matroska: write FlagInterlaced element in WebM
...
It's listed as supported in both https://www.webmproject.org/docs/container/
and https://matroska.org/technical/specs/index.html
Reviewed-by: Dave Rice <dave@dericed.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-04 19:42:55 -03:00
Josh de Kock
ee72b6d187
doc/developer: add sections for policies
...
And sort policies into these sections.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-04 18:42:13 +01:00
Josh de Kock
36fa3d8807
doc/developer: reword some of the policies
...
Explicitly state that FATE should pass, and code should work
for all reviewers who tested.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-04 18:41:50 +01:00
Adriano Pallavicino
21d3f0c020
lavc/ivi_dsp.c: fix warnings due to indentation
...
Signed-off-by: Adriano Pallavicino <adriano.pallavicino@gmail.com >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-04 18:38:41 +01:00
Timo Rothenpieler
5d4fea88d4
avcodec/cuvid: don't align frame size
...
hwcontext_cuda was changed to take care of proper alignment internally
2016-10-04 12:58:42 +02:00
Rodger Combs
14fe54bbfb
lavf/mpegtsenc: fix autobsf when the first NAL is 0x1<XX> bytes
2016-10-04 01:20:20 -05:00
Rodger Combs
63fbeebf6e
configure: add linker export script support on Darwin
...
This isn't a "version script" in the usual sense, since it doesn't set symbol
versions directly. Instead, the version for the whole .dylib is set in the
linker flags, and we generate a list of symbol patterns to export. This allows
us to keep our local symbols (e.g. ff_*) local on the platform.
The Darwin linker's exported_symbols_list format is a bit different than the
one used by the GNU linker. It doesn't handle local symbols at all, since when
a list is provided, all unlisted symbols are local by default; thus, we remove
local sections. It doesn't handle per-version sections, so we remove the
headers and brackets. It expects symbols to be prefixed with an underscore.
It errors if a listed symbol with no wildcards is not present in the output,
so we append an asterisk to any symbol that doesn't already end in one.
2016-10-04 01:11:04 -05:00
Steven Liu
be1d32492e
avformat/hlsenc: support multi level path in m3u8 with filename
...
before patch:
localhost:osx liuqi$ tree 20160926/
20160926/
└── file-20160909
└── 26
└── 16
└── 15
├── 46
│ ├── 13.ts
│ ├── 25.ts
│ ├── 36.ts
│ ├── 45.ts
│ └── 54.ts
└── 47
├── 04.ts
├── 14.ts
├── 24.ts
└── 35.ts
6 directories, 9 files
localhost:osx liuqi$ cat out.m3u8
#EXTM3U
#EXT-X-VERSION:3
#EXT-X-TARGETDURATION:12
#EXT-X-MEDIA-SEQUENCE:0
#EXTINF:11.360000,
13.ts
#EXTINF:10.800000,
25.ts
#EXTINF:9.120000,
36.ts
#EXTINF:8.760000,
45.ts
#EXTINF:10.200000,
54.ts
#EXTINF:10.720000,
04.ts
#EXTINF:9.600000,
14.ts
#EXTINF:10.600000,
24.ts
#EXTINF:8.760000,
35.ts
#EXT-X-ENDLIST
after patch:
localhost:osx liuqi$ tree 20160926/
20160926/
└── file-20160909
└── 26
└── 16
└── 15
├── 46
│ ├── 13.ts
│ ├── 25.ts
│ ├── 36.ts
│ ├── 45.ts
│ └── 54.ts
└── 47
├── 04.ts
├── 14.ts
├── 24.ts
└── 35.ts
6 directories, 9 files
localhost:osx liuqi$ cat out.m3u8
#EXTM3U
#EXT-X-VERSION:3
#EXT-X-TARGETDURATION:12
#EXT-X-MEDIA-SEQUENCE:0
#EXTINF:11.360000,
20160926/file-20160909/26/16/15/46/13.ts
#EXTINF:10.800000,
20160926/file-20160909/26/16/15/46/25.ts
#EXTINF:9.120000,
20160926/file-20160909/26/16/15/46/36.ts
#EXTINF:8.760000,
20160926/file-20160909/26/16/15/46/45.ts
#EXTINF:10.200000,
20160926/file-20160909/26/16/15/46/54.ts
#EXTINF:10.720000,
20160926/file-20160909/26/16/15/47/04.ts
#EXTINF:9.600000,
20160926/file-20160909/26/16/15/47/14.ts
#EXTINF:10.600000,
20160926/file-20160909/26/16/15/47/24.ts
#EXTINF:8.760000,
20160926/file-20160909/26/16/15/47/35.ts
#EXT-X-ENDLIST
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
2016-10-04 06:41:53 +08:00
Stephan Holljes
d0be0cbebc
lavf/aviobuf.c: Adapt avio_accept and avio_handshake to new AVIOContext API
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com >
2016-10-03 23:28:48 +02:00
Marton Balint
fbf8ac7d2a
lavd/openal: don't return zero sized packet if no samples are available
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-03 21:15:48 +02:00
Marton Balint
2face3e7b5
lavc/utils: disallow zero sized packets with data set in avcodec_send_packet
...
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-03 21:15:26 +02:00
Adriano Pallavicino
f4e692a0e9
lavf/bink.c: fix warning due to misleading indentation
...
Signed-off-by: Adriano Pallavicino <adriano.pallavicino@gmail.com >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-03 15:42:27 +01:00
Timo Rothenpieler
c4b78f9662
MAINTAINERS: add myself for hwcontext_cuda
2016-10-03 15:49:22 +02:00
Timo Rothenpieler
a0d7ce1406
avutil/hwcontext_cuda: align allocated frames
2016-10-03 15:49:22 +02:00
Matthieu Bouron
68822da8ff
lavc/mediacodecdec_h2645: fix nalu data_size type
2016-10-03 14:16:53 +02:00
James Almer
eb60256c20
fate: add bitexact decode flag to fate-svq3-watermark
...
Fixes failure with mmxext or 3dnow cpuflags enabled but ssse3 disabled
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-03 01:39:33 -03:00
Michael Niedermayer
cced8394b6
fate: Add PSP copy test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-03 01:44:16 +02:00
Josh de Kock
441d15b7c0
doc/t2h: use container
...
Full width text is really difficult to read, this makes it more
more legible on larger (widescreen) screens. It also means we aren't
inventing our own container instead of using the bootstrap one.
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-03 00:16:27 +01:00
Timo Rothenpieler
b7bd5b9794
configure: define posix source on cygwin
...
Some function definitions are missing without it,
for example sigaction.
Fixes ticket #5868
2016-10-02 17:28:30 +02:00
Marton Balint
4fdcd2f188
ffplay: remove unused viddec_width/viddec_height
...
Reviewed-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-02 15:40:29 +02:00
Marton Balint
d14b240ecf
ffplay: use decoder avctx for decoded subtitle width/height
...
Fixes ticket #5873 .
Reviewed-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-02 15:40:04 +02:00
James Almer
42111e8543
avcodec: fix arguments on xmm/neon clobber test wrappers
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-02 02:15:47 -03:00
Carl Eugen Hoyos
635a89b0bb
Changelog: Compress slightly to improve readability.
2016-10-02 03:28:43 +02:00
Josh de Kock
dc0f711459
lavc: remove libfaac wrapper
...
There is really no need for two aac wrappers, we already have
libfdk-aac which is better. Not to mention that faac doesn't
even support HEv1, or HEv2. It's also under a license which is
unusable for distribution, so it would only be useful to people
who will compile their own ffmpeg, only use it themselves (which
at that point should just use fdk-aac).
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-10-01 19:58:04 +01:00
James Almer
449f263f9f
avcodec: add missing xmm/neon clobber test wrappers for the new encode API
...
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-10-01 14:08:50 -03:00
Marton Balint
7ef3e5b593
lavfi/metadata: allow deleting all metadata
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-01 17:32:32 +02:00
Marton Balint
d946424f19
lavfi/metadata: fix setting metadata values
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-10-01 17:32:08 +02:00
wm4
4f8262e373
ffmpeg: use new encode API
2016-10-01 17:23:02 +02:00
wm4
8f6f232228
ffmpeg: use new decode API
...
This is a bit messy, mainly due to timestamp handling.
decode_video() relied on the fact that it could set dts on a flush/drain
packet. This is not possible with the old API, and won't be. (I think
doing this was very questionable with the old API. Flush packets should
not contain any information; they just cause a FIFO to be emptied.) This
is replaced with checking the best_effort_timestamp for AV_NOPTS_VALUE,
and using the suggested DTS in the drain case.
The modified tests (fate-cavs and others) still fails due to dropping
the last frame. This happens because the timestamp of the last frame
goes backwards (ffprobe -show_frames shows the same thing). I suspect
that this "worked" due to the best effort timestamp logic picking the
DTS over the decreasing PTS. Since this logic is in libavcodec (where
it probably shouldn't be), this can't be easily fixed. The timestamps
of the cavs samples are weird anyway, so I chose not to fix it.
Another strange thing is the timestamp handling in the video path of
process_input_packet (after the decode_video() call). It looks like
the code to increase next_dts and next_pts should be run every time
a frame is decoded - but it's needed even if output is skipped.
2016-10-01 17:22:22 +02:00
wm4
b2fea2fdee
ffmpeg: move subframe warning to libavcodec
...
With the new decode API, doing this in ffmpeg.c is impractical. There
was resistance against removing the warning, so put it into libavcodec.
Not bothering with reducing the warning to verbose log level for
subsequent wanrings. The warning should be rare, and only happen when
developing new codecs for the old API.
Includes a change suggested by Michael Niedermayer.
2016-10-01 17:22:02 +02:00
Hendrik Leppkes
3c18188f9f
doc/libav-merge: add a note for the skipped QSV functionality
2016-10-01 15:20:44 +02:00
Hendrik Leppkes
62c58c59d5
Merge commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c'
...
* commit 'ac7bfd69678f3966e38debdb27f4bde94dc0345c':
lavfi: add a QSV scaling filter
This is a noop since it depends on sharing a hwcontext with the
decoder/encoder, see 04b17ff and 130e1f1
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-01 15:19:18 +02:00
Hendrik Leppkes
04b17ff9e8
Merge commit 'ad9c9440d592e4d53d6bec9961b4b22e25387d70'
...
* commit 'ad9c9440d592e4d53d6bec9961b4b22e25387d70':
qsvenc: support getting the session from an AVHWFramesContext
This commit is a noop, as it needs to be fully re-implemented for our
qsv components.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-01 15:03:20 +02:00
Hendrik Leppkes
130e1f1df2
Merge commit 'a0524d9b1e1bb0012207584f067096df7792df6c'
...
* commit 'a0524d9b1e1bb0012207584f067096df7792df6c':
qsvdec: support getting the session from an AVHWFramesContext
This commit is a noop, as it needs to be fully re-implemented for our qsv
components.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-10-01 15:02:32 +02:00
Clément Bœsch
0fbd423905
doc/libav-merge: complete TODO section
2016-10-01 10:41:27 +02:00
Michael Niedermayer
68d619a31c
fate: Add regression test for Ticket 186
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-01 03:43:02 +02:00
Michael Niedermayer
588c2355a6
fate: Add fate-svq3-watermark
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-10-01 03:43:02 +02:00
Steven Liu
0d2dd5d96d
avformat/hlsenc: support mkdir_p for use_localtime_mkdir
...
when use use_localtime_mkdir to create multi level dir,
ffmpeg give error message:
ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -c copy -use_localtime 1
-use_localtime_mkdir 1 -hls_segment_filename '%Y%m%d/file-%Y%m%d/%s.ts'
out.m3u8
error message:
Could not create directory 20160926/file-20160926 with use_localtime_mkdir
add mkdir_p for support the multi level dir
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Tested-by: Zuo Genyu <1515161258@qq.com > (Windows)
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
2016-10-01 05:37:19 +08:00
Clément Bœsch
1a9b4bc4c7
doc/examples: build http_multiclient example
2016-09-30 19:35:52 +02:00
Clément Bœsch
1e647d200f
doc/examples/gitignore: add forgotten qsvdec entry
2016-09-30 19:35:52 +02:00
Clément Bœsch
3d064b7802
build: remove references to inexistant avcodec example
2016-09-30 19:35:52 +02:00
Clément Bœsch
f2579f7ee2
doc/examples/http_multiclient: fix mixed declarations and code
2016-09-30 19:35:52 +02:00
Clément Bœsch
fb5e58cd77
doc/examples/http_multiclient: fix compilation
...
Fixes error: no previous prototype for ‘process_client’ [-Werror=missing-prototypes]
2016-09-30 19:35:52 +02:00
Clément Bœsch
352ca77f8a
build: fix avio_dir_cmd and avio_reading example dependencies
2016-09-30 19:35:51 +02:00
Clément Bœsch
44103c6001
build: sort EXAMPLE_LIST
2016-09-30 19:35:51 +02:00
Timo Rothenpieler
97e7f03d35
avutil/hwcontext_cuda: use proper synchronization flag
2016-09-29 22:58:34 +02:00
Timo Rothenpieler
ba0e516533
avcodec/cuvid: make use of new av_hwdevice_ctx_create api
2016-09-29 22:58:34 +02:00
Timo Rothenpieler
49511501aa
avcodec/cuvid: support a pre-initialized hw_frames_ctx
2016-09-29 22:58:34 +02:00
Timo Rothenpieler
f0ea96d8a2
avcodec/cuvid: use actual frame size for buffer allocation
2016-09-29 22:58:34 +02:00
Jan Sebechlebsky
81bab1074f
avformat/tee: Copy interrupt callback and flags to slave
...
Copy interrupt callback to slave format context to allow
user to interrupt IO. Copy format flags as well.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
2016-09-29 17:17:26 +02:00
Timo Rothenpieler
856e1eacf7
ffmpeg_cuvid: make use of new av_hwdevice_ctx_create api
2016-09-29 15:57:32 +02:00
Anton Khirnov
bfbf86ef18
ffmpeg: pass the hwaccel frames context to the decoder
2016-09-29 15:57:32 +02:00
Carl Eugen Hoyos
e84eeca577
lavf/movenc: Put correct display aspect ratio in ARES atom.
2016-09-29 15:41:17 +02:00
Carl Eugen Hoyos
fcce25ee5d
lavf/mov: Read display aspect ratio from ares atom also for dnxhd.
...
Fixes aspect ratio of sample in ticket #2125 .
Fixes aspect ratio of sample in ticket #5325 .
2016-09-29 15:29:03 +02:00
Carl Eugen Hoyos
29a76ff525
Changelog: Mention edts support.
2016-09-29 14:44:08 +02:00
Jan Ekström
cc725ebe48
movenc: Add support for writing language codes into ISML manifests
...
Streaming servers appear to ignore all other language metadata.
Signed-off-by: Jan Ekström <jeebjp@gmail.com >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-29 10:32:03 +01:00
Sasi Inguva
dba2db6c0e
lavf/mov.c: Make audio timestamps strictly monotonically increasing inside an edit list.
...
Fixes gapless decoding. Adjust skip_samples field correctly in case of DISCARDed audio frames.
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-29 02:25:41 +02:00
Sasi Inguva
7e0235bdb1
lavc/utils.c: Subtract skip_samples when frame is DISCARDed.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-29 02:25:41 +02:00
Moritz Barsnick
1846a3eac8
ffmpeg_vaapi: fix choice of decoder_format
...
The check could previously never evaluate to true, probably due to
a typo.
Reported-By: Mihai Chindea <mihai.chindea@uti.eu.com >
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Tested-by: Mark Thompson <sw@jkqxz.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-29 01:23:52 +02:00
Steven Liu
95f2dcafe1
doc/muxers: fix hlsenc options examples error
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Reviewed-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-09-28 15:04:55 -08:00
James Almer
a68f1ae6b1
doc/codecs.texi: fix and expand color related options
...
Found-by: Michael Niedermayer <michael@niedermayer.cc >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-28 19:33:20 -03:00
Jan Ekström
6c10f8fe76
movenc: use similar logic to DASH when writing bit rate to ISML
...
This way, in case of bit rate not being set, max_bitrate will be
used instead. This enables, for example, re-using max_bitrate
information from the input or doing transcoding with a rate
control mode that is not bit rate based.
Signed-off-by: Jan Ekström <jeebjp@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-28 23:45:11 +02:00
James Almer
e4bfc9ecf7
avfilter/vf_colorspace: fix range for output colorspace option
...
Rreviewed-by: BBB
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-28 17:33:38 -03:00
raymondzheng1412@gmail.com
2366efce3c
avformat/concatdec: don't call open_file when seek position within a file
2016-09-28 20:31:22 +02:00
James Almer
13dd5edb88
avutil/hwcontext: use CONFIG_QSV instead of CONFIG_LIBMFX for qsv
...
See "[FFmpeg-devel] [PATCH] hwcontext: add a QSV implementation"
Suggested-by: nablet developer <sdk@nablet.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-28 15:13:10 -03:00
Philip Langdale
d6573275a7
ffmpeg_cuvid: Don't unnecessarily include nvcuvid.h
2016-09-28 10:44:37 -07:00
James Almer
eba0414768
Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'
...
* commit '59e7361cc791e5103be1712dc59a2055f118d0da':
hwcontext: add a QSV implementation
Conflicts:
doc/APIchanges
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 13:30:27 -03:00
James Almer
e9a5fc9678
Merge commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9'
...
* commit '6f19bbcf8532d018d8d6d82e000738d0ac2385c9':
qsvdec: move reading the user-provided session to qsv_decode_init()
Conflicts:
libavcodec/qsvdec.c
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 13:26:12 -03:00
James Almer
32c25f06b7
Merge commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa'
...
* commit 'e85f6f7f8d037c0af0f294000718d9ba22753baa':
lavc: allow using AVCodecContext.hw_frames_ctx for decoding
Conflicts:
doc/APIchanges
libavcodec/version.h
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 13:22:00 -03:00
James Almer
0153cc49b2
Merge commit '40dd5166d2ba4f9035b93748840e408cd8be40e5'
...
* commit '40dd5166d2ba4f9035b93748840e408cd8be40e5':
truemotion2rt: Use ff_set_dimensions
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 13:19:07 -03:00
James Almer
6e76c9c450
Merge commit 'a8164323374e86ce5f93759230868c98356833a2'
...
* commit 'a8164323374e86ce5f93759230868c98356833a2':
pixdesc: Add new SMPTE 431, 432, and 2085 color properties
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 13:12:18 -03:00
James Almer
f013ba475b
Merge commit '5d560d38deca1e4705e6d3784d737363b9c830fe'
...
* commit '5d560d38deca1e4705e6d3784d737363b9c830fe':
pixfmt: Add ARIB STD-B76 color transfer characteristic
See 785038c92c
Conflicts:
libavcodec/options_table.h
libavcodec/version.h
libavutil/pixdesc.c
libavutil/version.h
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 13:09:26 -03:00
James Almer
3597d32e88
Merge commit '6ed0f70f97c882813199b3bafd724ceeb43659de'
...
* commit '6ed0f70f97c882813199b3bafd724ceeb43659de':
avconv: factor out initializing stream parameters for streamcopy
Conflicts:
ffmpeg.c
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 12:59:07 -03:00
James Almer
df2ae8f3f0
Merge commit '5fa255b65c7887cc913f097aed1b581fbf1a8745'
...
* commit '5fa255b65c7887cc913f097aed1b581fbf1a8745':
avconv: initialize output framerate earlier
Skipping this for now. It's not needed until several committs ahead,
and should be carefully implemented.
Merged-by: James Almer <jamrial@gmail.com >
2016-09-28 12:57:58 -03:00
Carl Eugen Hoyos
83bf40f3cf
lavc/8bps: Fix 32bit output of 24bit video.
...
Regression since / partial revert of ba3bb53b
2016-09-28 17:49:39 +02:00
Sylvain Laurent
58776ccbdb
lavf/mpegtsenc: Set min PID for data pkt to 0x0010.
...
Fixes ticket #1673 .
2016-09-28 17:29:11 +02:00
Timo Rothenpieler
c03b9d6a62
avcodec/nvenc: nicely align AVOptions
2016-09-28 16:48:43 +02:00
Yogender Gupta
facc19ef06
avcodec/nvenc: Extended rate-control support as provided by SDK 7
...
Merged from libav commit by Yogender Gupta:
https://git.libav.org/?p=libav.git;a=commitdiff;h=70de2ea4261f860457a04e3d0c58c5543f403325
2016-09-28 16:48:43 +02:00
Timo Rothenpieler
033f98c902
avcodec/nvenc: add HEVC REXT profile
2016-09-28 16:48:43 +02:00
Timo Rothenpieler
a81b000a39
avcodec/nvenc: Make sure that enum and array index match
...
Based on libav commits by Luca Barbato and Yogender Gupta:
https://git.libav.org/?p=libav.git;a=commit;h=352741b5ead1543d775ccf6040f33023e4491186
https://git.libav.org/?p=libav.git;a=commit;h=e02e2515b24bfc37ede6ca1744696230be55e50b
2016-09-28 16:48:43 +02:00
Michael Niedermayer
2679ad4773
avformat/avidec: Check nb_streams in read_gab2_sub()
...
Fixes null pointer dereference
Fixes: 1/null_point.avi
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-28 16:46:24 +02:00
Michael Niedermayer
14bac7e00d
avformat/avidec: Remove ancient assert
...
This assert can with crafted files fail, a warning is already printed
for this case.
Fixes assertion failure
Fixes:1/assert.avi
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-28 16:46:24 +02:00
Adriano Pallavicino
25866680fd
lavc/qdm2: increase code clarity
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-28 12:35:58 +01:00
Sasi Inguva
7e9e1b7070
lavc/movtextdec.c: Avoid infinite loop on invalid data.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
2016-09-27 19:49:02 -07:00
James Almer
92de2c23a6
ffprobe: don't use AVStream.codec to set decoder framerate
...
Also don't set time_base. It's deprecated for decoding and avcodec_open2()
will overwrite it
Reviewed-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-27 21:21:42 -03:00
James Almer
29b6c2be29
avformat/matroskadec: set AVCodecParameters.field_order on progressive video
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-27 20:30:11 -03:00
Sophia Wang
8c83062acb
avformat/matroskadec: retain error codes in matroska_resync() and matroska_read_packet()
...
Signed-off-by: Sophia Wang <skw@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-28 01:24:51 +02:00
Mulvya
a54c3ff65f
doc/filters: blend terminates on longest input
...
Signed-off-by: Mulvya <mulvya@gmail.com >
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-09-27 11:06:37 -08:00
James Almer
4a05d2eda7
ffmpeg: stop using AVStream.codec on stream copy
...
This commit is based on commit 35c8580 from Anton Khirnov <anton@khirnov.net >
which was skipped in b8945c4 .
The avcodec_copy_context() call in the encode path is left in place for now
as AVStream.codec is apparently still required even after porting ffmpeg to
the new bsf API.
Tested-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-27 10:42:51 -03:00
James Almer
f0b6f7253f
avformat: add av_stream_get_codec_timebase()
...
This will allow ffmpeg.c to stop using AVStream.codec in some cases
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-27 10:42:39 -03:00
Michael Niedermayer
fd902510ac
swr: Update version & APIChanges for swr_build_matrix()
...
Found-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-27 15:26:13 +02:00
Michael Niedermayer
23c0779cda
swresample: Add swr_build_matrix()
...
API and Doxy documentation is taken from avresample_build_matrix()
Fixes: Ticket5780
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-27 12:54:00 +02:00
Michael Niedermayer
740f5105d5
swresample: Use double and float for matrixes for best quality and speed
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-27 12:53:25 +02:00
Carl Eugen Hoyos
dcc506a91e
doc: Mention -dn in the "Stream selection" paragraph.
...
There is no "Data options" paragraph.
Requested-by: ilker tezcan
2016-09-27 09:07:17 +02:00
James Almer
64545dd600
ffprobe: don't access AVCodecContext.pkt_timebase directly
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-26 22:45:39 -03:00
Michael Niedermayer
69449da436
avcodec/ansi: Check dimensions
...
Fixes: 1.avi
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-26 21:42:17 +02:00
Timo Rothenpieler
99b823f0a1
avcodec/mpegvideo_enc: fix memory leak
...
When the input frames contain side data, it will accumulate endlessly in
the coded frame, as av_frame_copy_props will append any new side data.
Fixes ticket #5799 .
2016-09-26 18:21:00 +02:00
Carl Eugen Hoyos
46aae84616
lavf/movenc: Allow to disable writing the timecode track.
...
Fixes ticket #5492 .
2016-09-26 08:50:48 +02:00
Jean-Yves Simon
fb37da37ac
avcodec/hevc: Add YUV420P10 to vaapi hardware decode - permits hardware decoding of HEVC Main 10 on AMD RX 480
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-26 03:29:00 +02:00
James Almer
449dc25f56
ffmpeg: fix memleak of bitstream filter context on failure
...
Increase the nb_bitstream_filters value as soon as the context is allocated, so
if option parsing fails the last context is actually freed.
Reviewed-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-25 16:17:59 -03:00
James Almer
3ac76d7618
ffmpeg: fix memleak of encoder options AVDictionary on failure
...
Reviewed-by: Josh de Kock <josh@itanimul.li >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-25 16:17:41 -03:00
James Almer
e3842e87f2
avcodec/Makefile: Fix mlpenc dependencies
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-25 16:12:18 -03:00
James Almer
aa0dc698db
avformat/avidec: remove warning about deprecated declarations
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-25 16:03:21 -03:00
Clément Bœsch
bd9e425459
doc/libav-merge: change gmane link to a ffmpeg.org one
2016-09-25 19:38:27 +02:00
Clément Bœsch
95a7cbb09d
doc: move out merge script to tools
2016-09-25 19:27:51 +02:00
Clément Bœsch
485f75b278
doc: remove codecpar mention in libav-merge.txt
2016-09-25 19:17:39 +02:00
Clément Bœsch
99dfa55d5a
Merge commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3'
...
* commit '1e93c1e30ff0e8bf6094a426ca60f005e9cdaed3':
avconv: do not set encoder options when streamcopy is used
This chunk was removed in 955b818cf9
already.
Merged-by: Clément Bœsch <u@pkh.me >
2016-09-25 19:15:44 +02:00
Josh de Kock
21344991c0
lavd/sdl2: add sdl alias
...
This commit also adds an sdl alias for the configure script.
2016-09-25 18:08:06 +01:00
Josh de Kock
fbb1fcd4d0
lavd/sdl2: remove unused code
2016-09-25 18:08:06 +01:00
Michael Niedermayer
b98dafe045
avformat/avidec: Fix memleak with dv in avi
...
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-25 19:06:51 +02:00
Michael Niedermayer
9083e044f1
ffmpeg: Fix bistream typos
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-25 19:06:51 +02:00
Xiaolei Yu
5a70e56f2f
avcodec: fix vc1dsp dependencies
2016-09-25 13:11:45 +02:00
Carl Eugen Hoyos
267da70ea8
lavf/utils: Avoid an overflow for huge negative durations.
...
Fixes ticket #5135 .
2016-09-24 21:01:46 +02:00
James Almer
dc48248ea8
avcodec/nvenc: use AVERROR_BUFFER_TOO_SMALL instead of ENOBUFS
...
Should fix compilation with mingw32
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-24 15:48:30 -03:00
Michael Niedermayer
1e34584814
avfilter/tests/integral: Remove unused variables
...
Reviewed-by: Clément Bœsch <u@pkh.me >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-24 20:30:40 +02:00
Clément Bœsch
5ef1959080
ffmpeg: switch to the new BSF API
...
This commit is initially largely based on commit 4426540 from Anton
Khirnov <anton@khirnov.net > and two following fixes (80fb19b and
fe7b21c ) which were previously skipped respectively in 98e3153 , c9ee36e ,
and 7fe7cdc .
mpeg4-bsf-unpack-bframes FATE reference is updated because the bsf
filter now actually fixes the extradata (mpeg4_unpack_bframes_init()
changing one byte is now honored on the output extradata).
The FATE references for remove_extra change because the packet flags
were wrong and the keyframes weren't marked, causing the bsf relying on
these proprieties to not actually work as intended.
The following was fixed by James Almer:
The filter option arguments are now also parsed correctly.
A hack to propagate extradata changed by bitstream filters after the
first av_bsf_receive_packet() call is added to maintain the current
behavior. This was previously done by av_bitstream_filter_filter() and
is needed for the aac_adtstoasc bsf.
The exit_on_error was not being checked anymore, and led to an exit
error in the last frame of h264_mp4toannexb test. Restoring this
behaviour prevents erroring out. The test is still changed as a result
due to the badly filtered frame now not being written after the failure.
Signed-off-by: Clément Bœsch <u@pkh.me >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-24 14:25:53 -03:00
Carl Eugen Hoyos
159aa1275e
lavd/sdl2: Fix 32bit rgb formats on little-endian hardware.
2016-09-24 18:56:40 +02:00
Carl Eugen Hoyos
1d92256d60
lavd/sdl2: Move unsupported formats SDL_PIXELFORMAT_xxx888 updwards.
...
There is a paragraph for unsupported SDL formats.
2016-09-24 18:35:15 +02:00
Carl Eugen Hoyos
04fa20d53c
lavf/aacdec: Do not autodetect a single frame inside the file.
2016-09-24 18:33:55 +02:00
Josh de Kock
47ea6f5c9d
lavd: drop SDL1 device and SDL1 support
...
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-24 16:52:40 +01:00
Marton Balint
9c5fab5ed4
ffplay: add SDL2 support
...
This commit also drops SDL1 support for ffplay.
Tested-by: James Almer <jamrial@gmail.com > (Windows, mingw-w64)
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-24 16:50:40 +01:00
Lukasz Marek
645353829f
lavd/opengl: use SDL2
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-24 16:50:40 +01:00
Josh de Kock
f94b8d2557
MAINTAINERS: update my entries
...
Acked-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-24 16:50:40 +01:00
Josh de Kock
3877e3d8a8
lavd: Add SDL2 output device
...
Acked-by: Michael Niedermayer
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-24 16:50:40 +01:00
Clément Bœsch
c29b532a94
lavfi: add nlmeans filter
...
Fixes Ticket #4910
2016-09-24 09:52:10 +02:00
Anssi Hannula
a6f5e25ad9
avformat/hls: Fix handling of EXT-X-BYTERANGE streams over 2GB
...
Replace uses of atoi() with strtoll() when trying to read values into
int64_t variables.
Fixes Kodi trac #16926 :
http://trac.kodi.tv/ticket/16926
2016-09-24 09:46:32 +03:00
Steven Liu
1212e3468e
avformat/hlsenc: refine EXT-X-BYTERANGE support for segments
...
refine EXT-X-BYTERANGE tag,
the spec link:
https://tools.ietf.org/html/draft-pantos-http-live-streaming-19#section-4.3.2.2
the apple doc:
https://developer.apple.com/library/ios/technotes/tn2288/_index.html#
//apple_ref/doc/uid/DTS40012238-CH1-BYTE_RANGE_SUPPORT_FOR_SEGMENTS
command line:
./ffmpeg -i ~/Movies/objectC/a.mp4 -c copy -f hls -hls_time 7
-hls_list_size 0 -hls_segment_size 2500000 -t 40 output-test.m3u8
output:
localhost:ffmpeg liuqi$ ll *.ts ;cat output-test.m3u8
-rw-r--r-- 1 liuqi staff 2792176 9 12 14:44 output-test0.ts
-rw-r--r-- 1 liuqi staff 3112528 9 12 14:44 output-test3.ts
-rw-r--r-- 1 liuqi staff 3377420 9 12 14:44 output-test6.ts
-rw-r--r-- 1 liuqi staff 1228016 9 12 14:44 output-test7.ts
#EXTM3U
#EXT-X-VERSION:4
#EXT-X-TARGETDURATION:10
#EXT-X-MEDIA-SEQUENCE:0
#EXTINF:9.021000,
#EXT-X-BYTERANGE:1334988@0
output-test0.ts
#EXTINF:3.000000,
#EXT-X-BYTERANGE:721356@1334988
output-test0.ts
#EXTINF:3.000000,
#EXT-X-BYTERANGE:735832@2056344
output-test0.ts
#EXTINF:6.000000,
#EXT-X-BYTERANGE:1645940@0
output-test3.ts
#EXTINF:3.000000,
#EXT-X-BYTERANGE:715152@1645940
output-test3.ts
#EXTINF:3.000000,
#EXT-X-BYTERANGE:751436@2361092
output-test3.ts
#EXTINF:9.000000,
#EXT-X-BYTERANGE:3377420@0
output-test6.ts
#EXTINF:3.960000,
#EXT-X-BYTERANGE:1228016@0
output-test7.ts
#EXT-X-ENDLIST
localhost:ffmpeg liuqi$
ticket-id: #5839
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-24 04:28:02 +02:00
Sasi Inguva
6a2cbf9014
ffprobe.c: Indicate decode-but-discard packets when doing -show_packets.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 23:09:23 +02:00
Michael Niedermayer
4a3b41bed0
fate: add Test for h264_mp4toannexb (ticket2991)
2016-09-23 21:36:58 +02:00
Michael Niedermayer
0e318f110b
avcodec/cavsdsp: use av_clip_uint8() for idct
...
Fixes out of array read
Fixes: 1.swf
Found-by: 连一汉 <lianyihan@360.cn >
Tested-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 18:18:18 +02:00
James Almer
d41c9b1c27
avcodec/remove_extradata_bsf: Fix AVoption parameter max value
2016-09-23 17:15:49 +02:00
Michael Niedermayer
1bd9b960ba
tests/fate/ffmpeg: Remove dead automatic remove extradata test update the keyframe test
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 17:15:49 +02:00
Hendrik Leppkes
5ae0ad001a
x86/h264_weight: use appropriate register size for weight parameters
...
Fixes trac 5579
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Acked-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 16:40:57 +02:00
Michael Niedermayer
a5fafabc84
tests/fate: Add fate-ffmpeg-bsf-remove-* tests
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 13:34:13 +02:00
Timo Rothenpieler
7904859fd8
compat/cuda: convert to unix line endings
2016-09-23 11:43:00 +02:00
Timo Rothenpieler
dcea618976
avcodec/cuvid: mark as avoid for probing
2016-09-23 11:17:49 +02:00
Timo Rothenpieler
9777ba33f5
avformat/utils: avoid using marked decoders for probing
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 11:16:26 +02:00
Timo Rothenpieler
30d3e36a46
avcodec: add new AVOID_PROBING capability
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 11:15:08 +02:00
James Almer
7d17d31db4
fate: update fate-source reference file
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-22 23:55:31 -03:00
Michael Niedermayer
bc26fe8927
avcodec/h264: Use ptrdiff_t for (bi)weight functions
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-23 04:10:44 +02:00
Philip Langdale
289a6bb8b1
cuvid: Pass bit depth information to decoder
...
Although cuvid can only output 8bit, it can consume HEVC Main10 if
the bit depth is set properly. In cases where >8bit is not supported,
this change is still beneficial as the decoder will fail to be
created instead of plowing throw and decoding as 8bit.
2016-09-22 18:39:46 -07:00
Philip Langdale
843aff3cf7
cuvid: Use bundled headers
...
We need to remove the dynlink fanciness and replace it with normal
function prototypes and update the include paths and configure logic.
We don't need to explicitly check for PICPARMS now - they're going
to be there.
2016-09-22 18:38:51 -07:00
Philip Langdale
f59e10b0f4
cuvid: Add MIT licenced nvcuid headers from Video SDK 7.0
...
For unknown reasons, the only accurately descriptive version of
cuviddec.h is in the Video SDK - the one in CUDA 7.5 lacks vp8
PICPARAMS and the vp9 struct definition is inaccurate. The CUDA 8 RC
includes an ancient version of this file from many many years go.
However, the one in the Video SDK is modified to work through a
dynamic link mechanism which we don't really want to use, so the
next change will modify the files to just declare functions in
the normal way.
I've split the changes so it's clear to see what changed between
the original files and ones that work for us.
2016-09-22 18:38:36 -07:00
Paul B Mahol
88d79dbd16
avformat/movenc: write pasp atom even if sar.num == sar.den
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-22 23:59:46 +02:00
Timo Rothenpieler
6d9a46e884
avformat/utils: force native h264 decoder for probing
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-22 13:16:00 +02:00
Carl Eugen Hoyos
c54eef46f9
lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy().
...
Fixes ticket #5857 .
2016-09-22 08:37:46 +02:00
Philip Langdale
7447ec91b5
crystalhd: Use up-to-date bsf API
...
Although the old API is supposed to be functional, the crystalhd
decoder is currently not working for non-annex.b h.264 content.
So, let's update to the modern API and make it work again.
Signed-off-by: Philip Langdale <philipl@overt.org >
2016-09-21 10:18:54 -07:00
Timo Rothenpieler
0b420886a4
avcodec/cuvid: add support for hardware deinterlacing
...
Currently does not work with the ffmpeg cli tool, due do it using the
old one in one out API.
Anything using the new API, like mpv, can make use of it, provided it is
prepared for a decoder modifying the framerate and outputing multiple
frames per input. FFmpeg itself is not.
2016-09-21 18:23:14 +02:00
Timo Rothenpieler
3b24020b54
avcodec/cuvid: implement new send_packet/receive_frame api
2016-09-21 18:22:27 +02:00
Michael Niedermayer
47ffcddaef
avcodec/mlz: Check output chars before using it
...
Fixes hypothetical integer overflow
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-21 16:28:14 +02:00
Michael Niedermayer
0a2ca417a1
avcodec/mlz: Remove 'l' postfixes from numbers
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-21 16:26:55 +02:00
Clément Bœsch
955b818cf9
ffmpeg: switch to codecpar
...
This commit is largely based on commit 15e84ed3 from Anton Khirnov
<anton@khirnov.net > which was previously skipped in bbf5ef9d .
There are still a bunch of things raising codecpar related warnings that
need fixing, such as:
- the use of codec->debug in the interactive debug mode
- read_ffserver_streams(): it's probably broken now but there is no test
- lowres stuff
- codec copy apparently required by bitstream filters
The matroska references are updated because they now properly forward
the field_order (previously unknown, now progressive).
Thanks to James Almer for fixing a bunch of FATE issues in this commit.
Signed-off-by: Clément Bœsch <clement@stupeflix.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-21 15:39:28 +02:00
Paul B Mahol
187c427335
avcodec/on2avc: add 0x500 stereo support and improve 0x500 mono support
...
0x500 can be stereo.
0x500 mono can use extended window types.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-21 14:37:25 +02:00
Paul B Mahol
257fbc3af4
avcodec/dds: add support for 4bpp format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-21 13:40:04 +02:00
Paul B Mahol
9d16e46d9e
avfilter/drawutils: allow drawing opaque text on transparent background
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-21 11:54:00 +02:00
Mark Reid
6419b4c0cb
test/fate: add multi component mxf test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-21 01:29:47 +02:00
Mark Reid
d8d4333217
avformat/mxfdec: use first valid sourceclip found if material track has multiple components
...
This commit fixes a issue with mxf footage having multiple
components on a material track.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-21 01:29:20 +02:00
Michael Niedermayer
fa0780d644
avcodec/avrndec: Remove obsolete FIXME
...
This FIXME probably meant to suggest to use a AVFrame that no longer
exists in the context.
Found-by: durandal117
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-20 21:36:04 +02:00
Michael Niedermayer
492259ccda
fate: add aac_adtstoasc test (Ticket 3715)
2016-09-20 15:52:08 +02:00
Michael Niedermayer
e048b46f14
fate: Add rgb24-mkv test
2016-09-20 13:37:25 +02:00
Carl Eugen Hoyos
11777eb814
lavc/rscc: Support pal8 in rscc.
...
Fixes the colours of the sample for ticket #5611 .
2016-09-19 23:26:06 +02:00
Moritz Barsnick
2c48014ab2
doc/encoders: minor aac encoder formatting improvements
...
Also corrected a line's level.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
2016-09-19 19:17:34 +01:00
Sasi Inguva
ca6cae73db
lavf/mov: Add support for edit list parsing.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-19 19:52:05 +02:00
Sasi Inguva
a53201879c
avcodec/utils: If using discard frame flag, ignore skip_samples set by the decoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-19 19:51:13 +02:00
Sasi Inguva
b518d809f1
lavf/utils: Support av_index_search_timestamp in case of AVIndexEntry with discarded packets.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-19 19:51:13 +02:00
Sasi Inguva
2dbedc20ce
lavc: Add a flag in AVPacket to discard packet after decoding. Discard frames after decoding based on the flag.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-19 19:51:13 +02:00
Sasi Inguva
778af68c70
avformat/avframe.h: Add a flag in AVIndexEntry to discard frame after decoding.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-19 19:51:13 +02:00
Sasi Inguva
3cb400c11a
avutil/frame: Add a flag to discard frame after decode.
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-19 19:51:13 +02:00
Paul B Mahol
590f025b3d
avcodec/rscc: add support for gray8 format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-19 18:31:45 +02:00
Jai Luthra
dfa489be01
MAINTAINERS: add myself for mlp/truehd
...
Signed-off-by: Jai Luthra <me@jailuthra.in >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-19 16:31:54 +02:00
Vittorio Giovara
cb78d14cf9
vf_colorspace: Interpret unspecified color range as limited range
...
This is the assumption that is made in pixel format conversion do
throughout the code (in particular swscale), and BT-specifications
mandate.
Add a warning to inform the user that an automatic selection is being
made.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2016-09-19 08:26:49 -04:00
Paul B Mahol
d38dff8e5d
avcodec/dnxhddata: add support for cid 1244
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-19 02:33:58 +02:00
Paul B Mahol
6216b4780b
avcodec/sheervideo: print internal format in debug log
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-18 18:49:15 +02:00
Paul B Mahol
260de8a264
avcodec/sheervideo: fix Y prediction in decode_ybr(i) for older formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-18 18:49:14 +02:00
Paul B Mahol
6cbd47bf90
avcodec/dvdsubdec: ignore h <= 1 case, to properly decode subtitle
...
Fixes #5825 . If h == 1, second decode_rle() fails.
Regression since: 3f0a3e9e12 .
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-18 15:22:48 +02:00
Josh de Kock
ef42c1de2b
Add CONTRIBUTING.md
...
TimothyGu (https://github.com/FFmpeg/FFmpeg/pull/153#issuecomment-143274708 )
suggested doing this a while ago, but it was never done. Adding as pull
requests seem to be still coming through.
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-09-18 10:02:13 +01:00
James Almer
ff0ff33b05
doc/general.texi: mention MLP/TrueHD encoding support
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-18 02:01:15 -03:00
Michael Niedermayer
a880923170
avformat/http: Fix #ifdef FF_API_HTTP_USER_AGENT
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-17 20:14:10 +02:00
Paul B Mahol
22bdba7a93
doc/filters: add two lut2 examples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-17 19:16:18 +02:00
Rostislav Pehlivanov
38c3fc9404
lavc: bump minor (after adding TrueHD and MLP encoders)
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-09-17 15:36:13 +01:00
Paul B Mahol
97f50d1c62
avfilter/vf_overlay: add YUVA422P to alpha_pix_fmts
...
Now yuv422 output format gives similar expected output as other output formats.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-17 15:38:30 +02:00
Paul B Mahol
0e7d2c60e9
avfilter/vf_overlay: support J formats too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-17 15:38:30 +02:00
Rostislav Pehlivanov
d4b36be122
Changelog: update with TrueHD and MLP encoders
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-09-17 13:41:39 +01:00
Jai Luthra
15b86f480a
mlpenc: Working MLP/TrueHD encoder
...
* Multichannel support for TrueHD is experimental
There should be downmix substreams present for 2+ channel bitstreams,
but ffmpeg decoder doesn't need it. Will add support for this soon.
* There might be lossless check failures on LFE channels
* 32-bit sample support has been removed for now, will add it later
While testing, some samples gave lossless check failures when enforcing
s32. Probably this will also get solved with the LFE issues.
Signed-off-by: Jai Luthra <me@jailuthra.in >
2016-09-17 13:23:56 +01:00
Philip Langdale
ee88dcb2b0
avcodec/cuvid: Check for non 420 chroma formats - they aren't supported
...
Despite the video parser seeming to correctly handle 422 and 444
chroma formats, the video decoder fails miserably to actually
decode frames - even though no errors are ever returned; you just
get frames showing unintialized garbage.
Signed-off-by: Philip Langdale <philipl@overt.org >
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-09-17 14:08:58 +02:00
Philip Langdale
8a06669702
avcodec/cuvid: Fully re-initialize the parser after a flush.
...
I'm not really sure how this worked at all before, but we do need to
reinitalize the parser with the stream extradata.
Signed-off-by: Philip Langdale <philipl@overt.org >
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-09-17 14:08:53 +02:00
Paul B Mahol
4096bb176b
avfilter/vf_unsharp: limit matrix size in either direction to 23
...
Anything bigger is not supported anyway.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-17 13:57:45 +02:00
Paul B Mahol
d790887d1c
avfilter/vf_unsharp: check if scalebits is too high
...
Otherwise filter would happily give overflows and produce useless output.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-17 13:57:45 +02:00
Steven Liu
27714b462d
lavf/http: deprecate user-agent option
2016-09-17 13:48:34 +02:00
Carl Eugen Hoyos
44bcb636c1
lavc/libvpxenc: Avoid vp8 transparency encoding with auto-alt-ref.
...
Fixes ticket #5815 .
2016-09-17 10:42:23 +02:00
Steven Liu
3ea28f3f79
doc/muxers: add flv muxer document into doc/muxers
...
add flvflags aac_seq_header_detect and flvflags no_sequence_end
document into doc/muxers
Reviewed-by: Lou Logan <lou@lrcd.com >
2016-09-16 16:16:04 -08:00
Pedro Arthur
8433d953e4
swscale: fix for sliced scaling artifacts
...
Signed-off-by: Pedro Arthur <bygrandao@gmail.com >
2016-09-16 11:25:28 -03:00
Paul B Mahol
5b509fafb0
avfilter/vf_lut2: also export video input bit depth
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-16 12:35:55 +02:00
Michael Niedermayer
51000b9945
avformat/movenc: Make the packet check more tolerant
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-16 11:44:13 +02:00
Michael Niedermayer
2834313933
avformat/movenc: Check packet in mov_write_single_packet() too
...
Fixes assertion failure
Found-by: durandal117
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-16 11:43:56 +02:00
Michael Niedermayer
deabcd2c05
avformat/movenc: Factor check_pkt() out
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-16 11:43:47 +02:00
Vignesh Venkatasubramanian
7238c53048
libavformat/webm_chunk: Option to specify HTTP header
...
Add an option to specify HTTP header in the WebM Chunk Muxer (this
works the same way as the 'method' parameter in the HLS muxer).
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-16 03:13:21 +02:00
Matthieu Bouron
140da8e810
lavc: add hevc mediacodec decoder
2016-09-15 21:48:28 +02:00
Paul B Mahol
b82c1a377a
avcodec/adpcm: clip step for ADPCM MTAF decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-15 17:24:40 +02:00
Paul B Mahol
4d677c7ae3
avformat/msf: add support for ATRAC3 codec
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-15 16:59:31 +02:00
Moritz Barsnick
022260271b
libavcodec/qsvdec_h2645.c: drop executable permission
...
Accidentally set in b93e223315 .
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
2016-09-15 15:52:39 +02:00
Martin Storsjö
f8a13c7213
lavf/rtsp: Fix a crash with the RTSP muxer.
...
Introduced in 00e122bc / bc2a3296
The whole block that the statement was added to is only
relevant when used as a demuxer, but the other statements
there have had other if statements guarding them. Make
sure to only run this whole block if being used as a
demuxer.
Fixes ticket #5844 .
2016-09-15 13:50:57 +02:00
Nikolas Bowe
96cd6f672e
avcodec/(e)ac3: Fix target_level for EAC3.
...
Currently when using target_level with EAC3 it produces silence. This small patch fixes target_level for decoding EAC3.
Example:
ffmpeg -y -i /tmp/test.wav -acodec eac3 -dialnorm -14 -ac 6 -b:a 384000 /tmp/test.m2ts
ffmpeg -y -target_level -24 -i /tmp/test.m2ts -acodec pcm_s16le -f matroska /tmp/out.mkv
ffplay /tmp/out.mkv
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-15 12:18:55 +02:00
Michael Niedermayer
6f062eb8d0
avformat/hlsenc: Emulate strftime("%z") using other functions if it does not work
...
This should fix the code on windows
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-15 02:31:42 +02:00
Vittorio Giovara
76c28360b5
vf_colorspace: Add modern names for color range option
...
Allows to use values returned from API and from ffprobe directly.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-09-14 17:24:22 -04:00
Paul B Mahol
92dbd65700
avcodec/h264_parser: fix for possible overflow
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-14 21:14:07 +02:00
Paul B Mahol
01fa4fb69e
avcodec/h264_parser: set missing pts for top/bottom field frames
...
Adopted from 4eb49fdde8 revert.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-14 20:32:24 +02:00
Carl Eugen Hoyos
93e041026f
lavc: Enable a53cc by default for x264 and qsv_h264.
2016-09-14 17:52:50 +02:00
Michael Niedermayer
a5af1240fc
avcodec/g726: Add missing ADDB output mask
...
Fixes: 1.poc
Fixes out of array read
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-14 15:50:07 +02:00
Xinzheng Zhang
ecc04b4f2f
avformat/utils: fix timebase error in avformat_seek_file()
...
When there is only one stream and stream_index has not specified,
The ts has been transferd by the timebase of stream0 without modifying the stream_index
In this condation it cause seek failure.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-14 15:50:07 +02:00
Steven Liu
c8528e54e5
avformat/flvenc: add no_sequence_end flags for flvflags
...
when split flv file by flv format at first, and cat flvs file
into one flv file, the flv sequence end is be used,
then the whole flv have many flv sequence end TAG.
this flags can give user an option to ignore write sequence end TAG
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-14 15:50:07 +02:00
Michael Niedermayer
e85c4a4706
avformat/flvenc: Add () around &
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-14 15:50:07 +02:00
Clément Bœsch
415f907ce8
lavf/utils: add missing ismv in MOV-like formats
2016-09-14 10:00:08 +02:00
Clément Bœsch
9112822e71
lavf/utils: simplify matching MOV-like formats
2016-09-14 09:59:22 +02:00
Clément Bœsch
ae1dd0c9a6
lavf: add avformat_transfer_internal_stream_timing_info() and use it in ffmpeg
...
In lavf we have access to st->internal->avctx so it's a better place
than in ffmpeg*.c and will allow moving to codecpar.
2016-09-14 09:57:55 +02:00
Jon Toohill
7f386bbe2a
ffmpeg: copy trailing_padding when using -acodec copy
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-13 23:59:41 -03:00
Steven Liu
84aebfc74e
avformat/flvenc: add FLVFlags for flvflags options
...
add FLVFlags type, be used to add new FLVFlags options
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-14 01:45:40 +02:00
Michael Niedermayer
9f18a970b2
avformat/hlsenc: Assume UTC if "%z" is unsupported in strftime()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-13 23:44:35 +02:00
Michael Niedermayer
22ba9a3cb8
avformat/hlsenc: Avoid "%T" "%F" in strftime() to improve compatibility
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-13 23:44:35 +02:00
Marton Balint
025db5afaf
avfilter/af_amerge: allow merging 1 input only
...
Useful when the amerge filter parameters are generated from a script based on
the number of input streams, by allowing 1 input it does not have to be handled
specially.
The split filter also allows 1 output, so it is more consistent to allow
merging 1 input as well.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-09-13 21:35:31 +02:00
Vittorio Giovara
d41bfa9c0b
vf_colorspace: Add BT-names for gamma22/28 transfer option
...
Allows to use values returned from API and from ffprobe directly.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2016-09-13 10:22:23 -04:00
Jonathan Campbell
c19da0cfd8
avcodec/mpeg12dec: add comments documenting the format of the DVD CC user-data packet.
...
this is to aid development and maintenance of that code.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-13 04:53:28 +02:00
Rodger Combs
1f6d7eb470
lavf: add a flag to enable/disable automatic bitstream filtering
...
This is mostly useful for muxers that wrap other muxers, such as dashenc
and segment. The actual duplicated bitstream filtering is largely harmless,
but delaying the header can cause problems when the muxer intended the header
to be written to a separate file.
2016-09-12 21:50:32 -05:00
Michael Niedermayer
5e1bf9d8c0
avcodec/avpacket: clear side_data_elems
...
Fixes null pointer dereference
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-12 23:53:07 +02:00
Rodger Combs
dca03ec5f4
ass_split: reindent
2016-09-12 15:57:51 -05:00
Rodger Combs
3b32e1313c
ass_split: fix handling of streams with no [Events] or Format: line
2016-09-12 15:57:50 -05:00
Paul B Mahol
a50ca6b357
avfilter/vf_convolution: add slice threading support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-12 14:38:45 +02:00
Paul B Mahol
afeffd891f
avfilter: add sobel and prewitt filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-12 14:38:45 +02:00
Paul B Mahol
b791d0e4e0
avfilter/vf_vaguedenoiser: calculate dimensions at init
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-12 14:38:45 +02:00
Paul B Mahol
dc669d5fbe
avfilter/vf_vaguedenoiser: change thresholding to function pointers
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-12 14:38:45 +02:00
Michael Niedermayer
5bbffe3412
avcodec/h264_refs: Change default case to av_assert0() to suppress warning
...
Should fix "libavcodec/h264_refs.c:372:13: warning: variable 'i' is used uninitialized whenever switch default is taken"
Found-by: durandal_17
Suggested-by: jkqxz
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-12 12:33:44 +02:00
Matthieu Bouron
025f75c3ad
lavc/ffjni: do not error out if the last non-mandatory field/method cannot be found
2016-09-12 09:56:37 +02:00
Jens Ziller
bc7066fd5d
libavcodec/mmaldec.c: set AVFrame interlaced_frame and top_field_first, AVCodecContext framerate
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-12 01:14:07 +02:00
Jan Sebechlebsky
b7760dd8d4
avformat/tee: Use BSF list API
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
2016-09-12 00:06:17 +02:00
Michael Niedermayer
cb114ed464
avformat/mux: implement AVFMT_FLAG_SHORTEST
...
This will allow fixing several bugs with the -shortest option
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-11 23:17:31 +02:00
Alex Converse
09317e3e06
ivfenc: Add VPX codec tags.
...
This fixes remuxing VPX from MP4 without manually overwriting the tag.
2016-09-10 16:40:47 -07:00
Paul B Mahol
97297fb144
avfilter/vf_overlay: inline yuv output formats
...
Overall speedup ~10-20%
Tested-by: Michael on mingw32 mingw64 linux32 mips and arm
2016-09-11 00:38:13 +02:00
Paul B Mahol
140a0485d3
avfilter/vf_overlay: split blend_image into functions for each overlay format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-11 00:27:01 +02:00
Michael Niedermayer
054f912c0d
avfilter/avf_concat: Make independent of the channel layout
...
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-10 23:19:01 +02:00
Philip Langdale
4029f05c8b
avcodec/cuvid: Always check for internal errors during parsing
...
The cuvid parser is basically undocumented, and although you'd
think that a failed callback would result in the overall parse
call returning an error, that is not true.
So, we end up silently trying to keep going as if nothing is wrong,
which doesn't achieve anything.
Solution: check the internal error flag every time.
Signed-off-by: Philip Langdale <philipl@overt.org >
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-09-10 22:27:24 +02:00
Paul B Mahol
b257266ee8
avfilter/af_amix: use ff_all_channel_counts() instead of ff_all_channel_layouts()
...
Adds support for filtering frames with unknown channel layouts.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-10 13:05:31 +02:00
Rodger Combs
7c5fed15a8
lavc/Makefile: add missing ADPCM_THP_LE objs
2016-09-09 20:07:55 -05:00
Rodger Combs
1177e42121
lavc/Makefile: g729dec: fix missing file
2016-09-09 20:07:55 -05:00
Michael Niedermayer
ae7d4e17eb
fate: Add copy-trac2211-avi test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-10 00:50:36 +02:00
Michael Niedermayer
24b3918901
tests/fate-run.sh: Analyze file generated in transcode()
...
This should be much more informative than a plain md5 difference
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-10 00:50:36 +02:00
Michael Niedermayer
68f4c2163e
avformat/movenc: Check first DTS similar to dts difference
...
Fixes assertion failure
Fixes: b84b53855a0b74560e64c6f45f505a13/signal_sigabrt_7ffff6ae7c37_3837_ef4e243ea5b4fa8d0becf4afe9166604.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-10 00:50:36 +02:00
Paul B Mahol
c784b5cfdc
avfilter/vf_histogram: set foreground alpha if possible in destination format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-10 00:28:28 +02:00
Lou Logan
915abab25c
doc/filters: add missing palette* options
...
Introduced in b7e78c7 and 93ae68d .
Fixes #5835 .
The paletteuse debug options that are not part of the official API are
not included (debug_kdtree and color_search).
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-09-09 09:37:26 -08:00
Timo Rothenpieler
b91e0e5987
avcodec/cuvid: check for and warn about invalid pkt_timebase
2016-09-09 17:56:07 +02:00
Timo Rothenpieler
132adf73af
avcodec/cuvid: use pkt_timebase instead of time_base
2016-09-09 17:56:07 +02:00
Thilo Borgmann
4d48add89b
lavc/alsdec: use get_bitsz() to simplify reading of the mantissa
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-09 11:50:12 -03:00
Clément Bœsch
6d60770247
tests/fate/ffmpeg: regroup stream copy tests under a fate-streamcopy rule
2016-09-09 16:49:16 +02:00
Matthieu Bouron
bf011695fd
lavc/hevc: store VPS/SPS/PPS data
2016-09-09 16:35:37 +02:00
Paul B Mahol
7055b28d98
avfilter/vf_datascope: cleanup code a little
...
Make few helper functions.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-09 14:16:22 +02:00
Paul B Mahol
5556392b3b
fate: add hstack and vstack
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-09 12:49:15 +02:00
Paul B Mahol
653ca05807
avfilter/vf_weave: do not leak unused frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-09 11:58:18 +02:00
Paul B Mahol
ac3f9be330
fate: add weave
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-09 11:55:45 +02:00
Michael Niedermayer
752e6dfa3e
avcodec/ccaption_dec: Use simple array instead of AVBuffer
...
This is simpler and fixes an out of array read, fixing it with AVBuffers
would be more complex
Fixes: e00d9e6e50e5495cc93fea41147b97bb/asan_heap-oob_12dcdbb_8798_b32a97ea722dd37bb5066812cc674552.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-09 11:01:24 +02:00
Matthew Gregan
7b3bc365f9
avformat/mov: Enable stream parsing for VP9.
...
MP4 media containing VP9 using superframes (such as
https://github.com/Netflix/vp9-dash/raw/master/DASH-Samples/Fountain_2997_0560kbps_640x480_4x3PAR.ivf_DashUnencrypted.ismv )
does not decode correctly with the built-in VP9 decoder because
superframes are passed to the decoder whole rather than split into
individual frames.
Signed-off-by: Matthew Gregan <kinetik@flim.org >
2016-09-08 22:20:46 -04:00
Steven Liu
1da00be009
avformat/segment: give a warning message for remove initial_offset option
...
ffmpeg have a generic solution working with all muxer named
output_ts_offset, output_ts_offset will instead of initial_offset
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-09 02:45:28 +02:00
Steven Liu
fff4df7fba
MAINTAINERS: Add myself for hlsenc
...
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-09 02:45:28 +02:00
Burt P
91117fc9f1
af_hdcd: fix bounds check in hdcd_envelope()
...
From Sebastian Ramacher.
https://github.com/bp0/libhdcd/pull/11
Signed-off-by: Burt P <pburt0@gmail.com >
2016-09-08 18:13:12 -05:00
Paul B Mahol
21de33dd83
fate: add swaprect
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-09 00:57:01 +02:00
Paul B Mahol
e9770b40b1
avfilter/vf_datascope: let user change background opacity
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-09 00:40:30 +02:00
Michael Niedermayer
037422178d
avcodec/alsdec: Fix reading 0 mantisse bits
...
Fixes assertion failure
Fixes: 848c24abc1721c9e3d1ba7bfee8d9fcc/asan_heap-oob_1d99eca_3709_567bba70d67e7d62714dcf56f26fb1da.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 22:16:48 +02:00
Michael Niedermayer
2d3099ad8e
avcodec/svq3: Reintroduce slice_type
...
Fixes out of array read
Fixes: 1642cd3962249d6aaf0eec2836023fb6/signal_sigsegv_2557a72_2995_04efaf2ff57a052f609a3b4a2ea4e622.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 22:16:35 +02:00
Michael Niedermayer
c0fc83ed41
avcodec/mlz: Check offset before writing
...
Fixes: 0cee183a09bff5aa5108429717c35a4d/asan_heap-oob_1d99eca_3702_9ef60e80de79082a778d3d9ce8ef3b64.mp4
Affects no release
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 20:31:15 +02:00
Michael Niedermayer
2f7a12fab5
avcodec/mlz: clear dict on allocation to ensure there are no uninitialized values
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 20:31:15 +02:00
Michael Niedermayer
f2192e0f03
avcodec/alsdec: Fix raw_mantissa memleak
...
Fixes: 0cee183a09bff5aa5108429717c35a4d/asan_heap-oob_1d99eca_3702_9ef60e80de79082a778d3d9ce8ef3b64.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 20:31:15 +02:00
Michael Niedermayer
837e72b016
avcodec/alsdec: Fix mlz memleak
...
Fixes: 0cee183a09bff5aa5108429717c35a4d/asan_heap-oob_1d99eca_3702_172c75af9868d4c2556a79cc2413f4cc.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 20:31:15 +02:00
Timo Rothenpieler
8ebe1dddfb
avcodec/nvenc: use frame size instead of surface size
2016-09-08 19:08:31 +02:00
Sergey Volk
347cb14b7c
avformat/mov: Fix potential integer overflow in mov_read_keys
...
Actual allocation size is computed as (count + 1)*sizeof(meta_keys), so
we need to check that (count + 1) won't cause overflow.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 11:35:44 +02:00
Paul B Mahol
26a19f8e92
fate: add shuffleframes test
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-08 11:14:42 +02:00
Paul B Mahol
ae31ab8070
avfilter/vf_shuffleframes: unbreak filter
...
Regression since 736e2e2c30 .
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-08 10:56:30 +02:00
Paul B Mahol
8cfe60ef39
doc/filters: itemize shuffleframes & shuffleplanes examples
...
Add one more shuffleframes example.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-08 10:26:33 +02:00
Michael Niedermayer
2793ebd6cb
avformat/hlsenc: implement program_date_time
...
Reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-08 02:22:21 +02:00
Paul B Mahol
4fb6f9de0c
avfilter/vf_waveform: make possible to change background opacity
...
Only useful if output pixel format have alpha.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-07 22:38:14 +02:00
Matthieu Bouron
4b290078e4
lavc/mediacodecdec_h264: use h264_parse.h instead of h264dec.h
...
ff_h264_decode_extradata is referenced by h264_parse.h and not
h264dec.h.
2016-09-07 21:04:13 +02:00
Matthieu Bouron
256e99f6f0
lavc/mediacodecdec_h264: move bsf variable declaration at the top of the function
2016-09-07 21:04:13 +02:00
Carl Eugen Hoyos
3e886e7307
ffmpeg_opt: Suggest to use "file:..." if a protocol was not found.
...
Fixes Debian bug 785690.
2016-09-07 18:51:37 +02:00
Sven C. Dack
4aeb7a88ec
avcodec/nvenc: support RGB input
...
nvenc still encodes as yuv, but does the conversion internally which
brings some performance gains.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-09-07 18:44:10 +02:00
Timo Rothenpieler
fa3ecad071
avcodec/nvenc: correctly set inputPitch
2016-09-07 18:44:10 +02:00
Timo Rothenpieler
96cba1c552
avcodec/nvenc: use av_image_copy for copying frame data
2016-09-07 18:44:10 +02:00
Steven Liu
30a09eae98
tests/fate:Add FATE for hls_flags append option
...
add tests/ref/fate/filter-hls-append for FATE
add hls-list-append fate use filter make audio data and test hls_flags
append options
Signed-off-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-07 18:39:08 +02:00
Carl Eugen Hoyos
7a8e5ff1fd
lavc/avcodec: Improve av_parser_parse() documentation, mention padding.
...
Fixes ticket #5809 .
2016-09-07 18:37:01 +02:00
Burt P
38445d58f1
af_hdcd: hdcd_analyze_gen() using int instead of float
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-09-07 10:59:18 -05:00
Burt P
eb0086588f
af_hdcd: tweak hdcd_analyze_prepare() a bit
...
* use the actual sample rate
* use a more sensible frequency for the tone
* update fate test result
Signed-off-by: Burt P <pburt0@gmail.com >
2016-09-07 10:54:30 -05:00
Burt P
e700e21b6f
af_hdcd: move decoding setup from init to config_input
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-09-07 10:54:08 -05:00
Burt P
91be2ad756
af_hdcd: fix possible integer overflow
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-09-07 10:53:41 -05:00
Burt P
5e553cab68
af_hdcd: some types renamed to remove _t
...
Following a suggestion by Diego Biurrun.
_t is reserved for POSIX, apparently.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-09-07 10:49:04 -05:00
Paul B Mahol
7a258ef97e
avcodec/gif: don't honor transparency if palette changed
...
It generally does not work.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-07 15:56:13 +02:00
Paul B Mahol
b7e78c75cc
avfilter/vf_paletteuse: add option to use new palette for each output frame
2016-09-07 15:56:13 +02:00
Paul B Mahol
93ae68d62a
avfilter/vf_palettegen: add mode for generating palette for each input frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-07 15:56:13 +02:00
Paul B Mahol
424f0f9e33
avfilter: add avgblur filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-07 15:36:54 +02:00
Matthieu Bouron
f574012d5f
lavc/mediacodecdec_h264: fix SODB escaping
...
Fixes escaping of consecutive 0x00, 0x00, 0x0{0-3} sequences.
2016-09-07 15:35:09 +02:00
Michael Niedermayer
207d78176f
avformat: Export ticks_per_frame in st->codec
...
Fixes regressions with stream copy and output timebase/fps being twice as fine as needed
Makes the timebase and ticks per frame handled identical which should make the
code easier to understand and work with. It does not solve the problem without
st->codec access
Suggested-by: Hendrik Leppkes
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-07 11:11:56 +02:00
Michael Niedermayer
ba7be8c083
swscale: Fix "warning: ISO C90 forbids mixed declarations and code"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-07 01:44:16 +02:00
Michael Niedermayer
a97e35e7c2
avcodec: Fix successfull typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-07 01:43:07 +02:00
Rodger Combs
843e72ea55
lavf/matroskaenc: use mkv_check_tag_name consistently
...
Previously, we used a different list of checks when deciding whether to
write a set of tags at all than we did when deciding whether to write an
individual tag in the set. This resulted in sometimes writing an empty
tag master and seekhead. Now we use mkv_check_tag_name everywhere, so
if a dictionary is entirely composed of tags we skip, we don't write a
tag master at all.
This affected the test file, since "language" was on one list but not
the other, so we were writing an empty tag master there. The test hash
is updated to reflect that change.
2016-09-06 17:25:37 -05:00
Rodger Combs
3829a02738
lavf/matroskaenc: skip writing "duration" tags
2016-09-06 17:25:36 -05:00
Rodger Combs
6ede4e93ca
lavf/matroskaenc: move skipped metadata keys to separate function
2016-09-06 17:25:36 -05:00
Philip Langdale
86910b15c9
cuvid: Implement flush to support seeking in media players
...
Right now, if we attempt to use cuvid in a media player and then
try to seek, the decoder will happily pass out whatever frames were
already in flight before the seek.
There is both the output queue in our code and some number of frames
within the cuvid decoder that need to be accounted for.
cuvid doesn't support flush, so our only choice is to do a brute-force
re-creation of the decoder, which also implies re-creating the parser,
but this is fine.
The only subtlty is that there is sanity check code in decoder
initialisation that wants to make sure the HWContextFrame hasn't already
been initialised. This is a fair check to do at the beginning but not
after a flush, so it has to be made conditional.
Signed-off-by: Philip Langdale <philipl@overt.org >
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-09-06 21:52:05 +02:00
Philip Langdale
1891dfe013
cuvid: Add hwaccels and decoders for remaining supported formats
...
cuvid/nvdecode also supports mpeg1, mpeg2, h.263/mpeg4-asp and mjpeg.
It should, in theory, also support wmv3 via the vc1 support, given
that vdpau supports this. However, it failed to play wmv3 samples
which vdpau played correctly, so I'm not sure what to make of it.
Signed-off-by: Philip Langdale <philipl@overt.org >
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-09-06 21:35:42 +02:00
Michael Niedermayer
eed7e08646
tests/fate/ffmpeg: add simple ts->avi copy test
...
Approved-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-06 18:04:49 +02:00
Michael Niedermayer
cf9500a4dc
tests/fate/ffmpeg: add test for mpegts->mxf steram copy (Ticket 4914)
...
Approved-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-06 18:04:49 +02:00
Michael Niedermayer
ba96a2ac85
test/fate: Add Ticket 236 / mov stream copy test
...
Approved-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-06 18:04:49 +02:00
Michael Niedermayer
86f8ce9f3d
tests/fate-run: add transcode() as a simplified enc_dec()
...
Approved-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-06 18:04:49 +02:00
Timo Rothenpieler
e3fd1857fb
swscale: add unscaled conversion from yuv420p to p010
2016-09-06 12:41:28 +02:00
Michael Niedermayer
fdd9663781
avfilter/fifo: Make independent of the channel layout
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-06 12:36:28 +02:00
Michael Niedermayer
db3b93319d
avfilter/af_atempo: Make independent of the channel layout
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Reviewed-by: Pavel Koshevoy <pkoshevoy@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-06 12:36:28 +02:00
Michael Niedermayer
3a3265899b
avfilter/af_amix: make independent of the channel layout
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-06 12:36:28 +02:00
Carl Eugen Hoyos
70f4b453cb
doc/showspectrum*: Change options order to reflect numeric values.
...
Fixes ticket #5823 .
2016-09-06 11:52:10 +02:00
Paul B Mahol
496d97f465
avfilter/vf_owdenoise: hight bit-depth support
2016-09-06 01:29:46 +02:00
Carl Eugen Hoyos
f077ad69c6
lavc/avpacket: Fix undefined behaviour, do not pass a null pointer to memcpy().
...
Fixes ticket #5128 .
2016-09-05 10:16:03 +02:00
Paul B Mahol
e7bc9623e5
avcodec/pnmdec: fix undefined behaviour
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-05 10:06:25 +02:00
Michael Niedermayer
880d8e88ee
MAINTAINERS: Replace AvxSynth Team by Stephen Hutchinson for avisynth.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-05 09:19:10 +02:00
Franklin Phillips
cefce6e2c1
avformat/hlsenc: fix incomplete write of subtitle HLS playlist
...
This patch is a fix for the bug with ticket number 5812
(https://trac.ffmpeg.org/ticket/5812 ).
Basically, the bug is that the last segment and the "#EXT-X-ENDLIST"
tag are not being written to the subtitle playlist file when
converting a file with subtitles to the HLS format. The reason for
this seem to be that the filename for the subtitle file is being freed
too early. This solution is simply to free that memory after it's last
use in the "hls_window" function.
Signed-off-by: Franklin Phillips <franklinphillips9p8@inbox.lv >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-05 08:52:28 +02:00
Paul B Mahol
443c9fab57
avfilter/vf_gblur: add sigmaV option, different vertical filtering
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-04 23:59:45 +02:00
Carl Eugen Hoyos
445522c01b
fate: Add test for ticket #5805 .
2016-09-04 20:28:29 +02:00
Paul B Mahol
3c55baf08f
avccodec/utvideoenc: support encoding ULY4 and ULH4
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-04 15:51:33 +02:00
Paul B Mahol
28b920c09b
avfilter/Makefile: move anullsrc and nullsink to correct place
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-04 15:33:05 +02:00
Paul B Mahol
9833cf2ae1
avfilter/vf_bitplanenoise: silence clang warning, do not truncate value
2016-09-04 15:33:05 +02:00
Paul B Mahol
ee605aa730
avfilter: add gblur filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-04 15:33:05 +02:00
Paul B Mahol
817846d0c3
doc/filters: improve weave example
2016-09-04 14:51:27 +02:00
Vittorio Giovara
5df993f3b1
vf_colorspace: Allow overriding input color properties
...
The filter needs input frames with color properties filled out by
the decoder. Since this is not always possible, add input options to
the filter so that user may override color space, color primaries,
transfer characteristics, and color range, as well as a generic option
to set all properties at once.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-09-04 13:11:32 +02:00
Christophe Gisquet
b6e8efb082
fate: add 12bpp sample
...
Allows testing simple_idct12 correctness/bitexactness, as the sample
was generated using faani as idct.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-04 12:05:06 +02:00
Matt Oliver
8b4e4bc620
configure: Remove fifo muxers dependency on pthreads.
...
Signed-off-by: Matt Oliver <protogonoi@gmail.com >
2016-09-04 17:07:22 +10:00
Paul B Mahol
c62cb9bf5a
avcodec/utvideodec: add support for ULY4 and ULH4
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-04 01:57:50 +02:00
James Almer
d2e74315e5
avcodec/utils: print only the padding values that are set
...
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-03 11:57:23 -03:00
James Almer
4fed4aca0c
avcodec/utils: print initial and trailing paddings only in verbose levels
...
Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-03 11:57:18 -03:00
Carl Eugen Hoyos
3c821a1a7b
lavf/udp: Do not use MCAST_* for multicast on tvOS.
...
Fixes ticket #5774 .
2016-09-03 15:18:40 +02:00
Carl Eugen Hoyos
2dfd0f4b9e
lavf/webm_chunk: Print an error if no header filename was provided.
2016-09-03 14:31:55 +02:00
Carl Eugen Hoyos
a6a453ccd1
Cosmetics: Reindent after e82b181f.
2016-09-03 14:23:32 +02:00
Carl Eugen Hoyos
e82b181f80
lavc/mjpegdec: Only read JFIF thumbnail size if the segment is long enough.
...
Fixes ticket #5805 .
2016-09-03 14:21:46 +02:00
Michael Niedermayer
b4d7c1f84b
swscale/swscale_unscaled: Try to fix bayer_to_yv12_wrapper() with slices
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-03 14:14:06 +02:00
Michael Niedermayer
e57d99dd4e
swscale/swscale_unscaled: Try to fix Rgb16ToPlanarRgb16Wrapper() with slices
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-03 14:14:06 +02:00
Carl Eugen Hoyos
8f0bd1d9ba
lavf/httpauth: Do case-insensitive http header checks.
...
Tested by trac user NTAuthority.
Fixes ticket #5786 .
2016-09-03 13:56:40 +02:00
Carl Eugen Hoyos
91842005fe
lavf/img2dec: Skip DQT segment when auto-detecting jpg.
...
DQT segments may contain 0xFFs which break auto-detection.
2016-09-03 13:38:16 +02:00
Carl Eugen Hoyos
cef5bc0e6e
lavc/mjpegdec: Do not skip reading quantization tables.
...
They may contain 0xFFs, confusing the start code finding algorithm.
Fixes ticket #5819 .
2016-09-03 13:25:54 +02:00
Timo Rothenpieler
39f75645c8
swscale: add unscaled copy from yuv420p10 to p010
2016-09-03 00:09:39 +02:00
Timo Rothenpieler
1c37be6e95
configure: check for dlsym as well
...
For some reason, when compiling with gcc-asan and a recent enough gcc
version(seen on 5.3+ so far), linking dlopen works without -ldl, but
dlsym fails with:
undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
So this patchs checks for both dlopen and dlsym to work for determining
if -ldl is needed.
2016-09-03 00:09:39 +02:00
Michael Niedermayer
47bc1bdafb
swscale/swscale_unscaled: Fix packed_16bpc_bswap() with slices
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-02 21:53:53 +02:00
Michael Niedermayer
89ec11e096
swscale/swscale: Try to fix rgb48Toxyz12() with slices
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-02 21:53:53 +02:00
Michael Niedermayer
f580719b1a
swscale/swscale: Factor bottom to top handling
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-02 21:53:53 +02:00
Paul B Mahol
5dcd913ab5
doc/filters: add weave example
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-02 18:30:07 +02:00
Michael Niedermayer
7a6c288c2b
swscale/tests/swscale: add cpuflags option
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-02 16:14:21 +02:00
Paul B Mahol
b5cf307d0f
avfilter/vf_zscale: make possible to change chroma location
2016-09-02 16:10:30 +02:00
Michael Niedermayer
e4e4a9cad7
avformat/avidec: Fix infinite loop in avi_read_nikon()
...
Fixes: 360/test.poc
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-02 13:57:40 +02:00
Davinder Singh
367577dbe2
avfilter/vf_minterpolate: rename chroma log vars
...
also use AVPixFmtDescriptor instead of avcodec_get_chroma_sub_sample()
for log2_chroma*.
2016-09-02 13:08:21 +02:00
Paul B Mahol
3e1356f790
avfilter: add weave filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-09-02 12:27:28 +02:00
Clément Bœsch
1895e3a24f
ffmpeg: fix broken indent/style in write_frame
2016-09-02 11:01:46 +02:00
Michael Graczyk
be07c25896
libavcodec/opus: Add channel mapping 2 to extradata parser
...
This allows libavcodec/opus to demux ambisonics in an ogg/opus container.
Channel mapping family 2 is being added in this standards track IETF draft:
tools.ietf.org/html/draft-ietf-codec-ambisonics-00
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-01 23:53:24 +02:00
Mark Thompson
a2c912c3b6
lavu/timestamp: Avoid C++-unfriendly code in user header
...
Including this header in a C++11 program (inside extern "C") will
throw an error because it looks like a user-defined literal. Add a
space between the two tokens to avoid the problem.
2016-09-01 20:01:28 +01:00
Michael Graczyk
5d054a1ac4
libavcodec/opus: Fix spelling in error message
2016-09-01 10:29:08 -08:00
James Almer
f66abefefe
configure: add missing check for LoadLibrary
...
Commit 2b1d316ff6 made nvenc depend on
LoadLibrary, but the availability of the latter was never checked.
This fixes nvenc on Windows platforms
Signed-off-by: James Almer <jamrial@gmail.com >
2016-09-01 13:50:38 -03:00
Erkki Seppälä
499e8b0952
avformat/movenc: added ability to use original stream ids as track ids instead of regenerating them
...
Sometimes it's useful to be able to define the exact track numbers in
the generated track, instead of always beginning at track id 1. Using
the option use_stream_ids_as_track_ids now copies the use stream ids
to track ids. Dynamically generated tracks (ie. tmcd) have their track
numbers defined as continuing from the highest numbered stream id.
Signed-off-by: Erkki Seppälä <erkki.seppala.ext@nokia.com >
Signed-off-by: OZOPlayer <OZOPL@nokia.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-01 14:56:10 +02:00
Lucas Cooper
aabe12eba3
avfilter/vf_psnr: Add max value output option to psnr stats log.
...
This allows retroactive calculation/aggregation of PSNR from the stats
log.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-09-01 11:54:31 +02:00
Timo Rothenpieler
2b1d316ff6
configure: fix ldl dependency for new nvenc encoder names
2016-08-31 20:16:00 +02:00
Timo Rothenpieler
20f0902010
configure: fix nvenc detection logic
2016-08-31 15:40:00 +02:00
Timo Rothenpieler
99882d05a6
swscale: add support for P010LE/BE output
2016-08-31 13:19:46 +02:00
Timo Rothenpieler
2625b955a3
avfilter/drawutils: honor shift for color component description
2016-08-31 13:19:46 +02:00
Timo Rothenpieler
d3a23b6777
avfilter/drawutils: P010 is not supported
2016-08-31 13:19:46 +02:00
Paul B Mahol
8175fb03f0
avfilter/vf_lut: unbreak planar rgb suppot on big-endian
2016-08-31 11:18:40 +02:00
Steven Liu
3aab6fa6ba
avformat/hlsenc: add warning for append_list and hls_init_time option
...
When use append_list mode, the hls_init_time set nouse,
Because the append_list only support append at the old m3u8 end
cannot set init segments durations at the middle of the list.
That's invalid. and show a warning message for user.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-31 02:48:39 +02:00
Umair Khan
9fbf0660c1
MAINTAINERS: Add myself for alsdec
...
Signed-off-by: Umair Khan <omerjerk@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-30 18:18:05 +02:00
Simon Hailes
a13a81a0dc
avformat/crypto: add seeking support on read
...
cyrpto allows reading of data which has been aes-128-cbc encrypted given a key and an iv. But it did not handle filetypes which require seeking... e.g. it failed on an encrypted .mp4 file.
example:
take 25.mp4 created with:
ffmpeg -f lavfi -i sine=frequency=1000:beep_factor=2:r=48000:duration=720.0 -f lavfi -i testsrc=duration=720.0:rate=25 -vcodec libx264 -cmp 22 -timecode 10:00:00:00 -r 25 -y out\25.mp4
encrypt with:
openssl enc -aes-128-cbc -K 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -in 25.mp4 -out 25.enc
then to transcode in ffmpeg:
ffmpeg -key 12345678901234567890123456789012 -iv 12345678901234567890123456789012 -i crypto:25.enc -vcodec mpeg4 -r 25 -y 25dec.mp4
prior to this modification, the transcode would fail.
Note also: crypto previously maked both reads and writes as streamed, which caused the whole file
to be read before the transcode started. Now, for read only, if the underlying layer is not marked as streamed,
then crypto is not. This should enable efficient reading of encrypted containers which require seeking.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-30 17:14:28 +02:00
Simon Hailes
a2fcacc880
libavformat/crypto - encourage reads of 4096 bytes
...
the current implementation reads in chunks of 149x16=2384 bytes.
Seems more logical for it to read in chunks of 4096
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-30 17:10:11 +02:00
Tobias Rapp
a648391896
cmdutils: fix implicit declaration of SetDllDirectory function
...
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-29 19:52:39 -03:00
James Almer
115a90a0db
doc/APIChanges: mention nb_threads addition to AVFilterContext
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-29 21:56:20 -03:00
Stephen Hutchinson
92916e8542
avisynth: support pix_fmts added to AviSynth+
...
A number of new pix_fmts have been added to AviSynth+:
16-bit packed RGB and RGBA
10-, 12-, 14, and 16-bit YUV 4:2:0, 4:2:2, and 4:4:4
8-, 10-, 12-, 14-, and 16-bit Planar RGB
8-, 10-, 12-, 14-, and 16-bit Planar YUVA and Planar RGBA*
10-, 12-, 14-, and 16-bit GRAY variants*
32-bit floating point Planar YUV(A), Planar RGB(A), and GRAY*
*some of which are not currently available pix_fmts here and were
not added to the demuxer due to this
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-30 00:23:52 +02:00
Michael Niedermayer
ac028794ad
avutil/version: Improve lib versioning scheme for release branches with the next major release
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-29 22:32:08 +02:00
Michael Niedermayer
adbf1c9054
avutil/version: Mention similarities and differences to semver
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-29 22:27:52 +02:00
Davinder Singh
11a631d4a7
avfilter/vf_minterpolate: do not right shift negative numbers
...
It was source of crashes. Use division instead.
Original patch by author. Log message by comitter.
2016-08-29 17:32:47 +02:00
Paul B Mahol
a0a57072c9
avfilter: make use of ff_filter_get_nb_threads
2016-08-29 16:27:09 +02:00
Paul B Mahol
5b1907142d
avfilter: add ff_filter_get_nb_threads()
2016-08-29 16:27:09 +02:00
Paul B Mahol
449339084f
avfilter: add nb_threads to AVFilterContext
...
To be used in following commits.
2016-08-29 16:27:09 +02:00
Steven Liu
7ba98824a9
doc/muxers: add option hls_init_time document
...
Reviewed-by: Ibrahim Tachijian <barhom@netsat.se >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-29 14:54:39 +02:00
Steven Liu
557ad3a474
avformat/hlsenc: add option hls_init_time to set init hls window segment duration
...
recover segments duration time by hls_time after init hls window.
This is reuqested by Ibrahim Tachijian
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-29 14:54:27 +02:00
Thomas Hebb
a37e6dd2ba
avformat/mov: aax: pass proper AVClass to av_log()
...
av_log() expects its first parameter to be a pointer to a struct whose
first element is a pointer to an AVClass. In what I can only imagine is
a typo, one call to av_log() in the AAX decryption code instead passes
a pointer to an AVSHA struct, which doesn't even contain a pointer as
its first element, much less a pointer to an AVClass. Change the call to
pass the current MOVContext, as surrounding calls do.
The incorrect AVClass was causing mpv to emit the warning "av_log
callback called with bad parameters" when playing an .aax file.
Signed-off-by: Thomas Hebb <tommyhebb@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-28 20:54:22 +02:00
Timo Rothenpieler
cac2df230e
avcodec/nvenc: update license header
2016-08-28 19:51:22 +02:00
Timo Rothenpieler
26a5cbd781
avcodec/nvenc: use proper soname for cuda/nvenc libraries
2016-08-28 19:49:56 +02:00
Timo Rothenpieler
df615efcf2
avcodec/nvenc: check maximum driver API version
2016-08-28 19:46:44 +02:00
Timo Rothenpieler
a19989cae5
avcodec/nvenc: fix potantially uninitialized free
2016-08-28 18:58:05 +02:00
Timo Rothenpieler
19e75fd883
avcodec/nvenc: fix library names on cygwin
2016-08-28 18:58:05 +02:00
Marton Balint
2ee8a4f887
ffmpeg: fix -stream_loop with -re
...
Otherwise the stream failed with EAGAIN.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-08-28 18:22:24 +02:00
Oliver Collyer
a81b398e86
avcodec/nvenc: added support for rate control lookahead
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-08-28 16:47:54 +02:00
Oliver Collyer
d1bf8a3aa8
avcodec/nvenc: added support for 10 bit HEVC encoding
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-08-28 16:47:54 +02:00
Timo Rothenpieler
325e56479f
avcodec/nvenc: include nvEncodeAPI v7 SDK header
...
As Nvidia has put the most recent Video Codec SDK behind a double
registration wall, of which one needs manual approval of a lenghty
application, bundling this header saves everyone trying to use NVENC
from that headache.
The header is still MIT licensed and thus fine to bundle with ffmpeg.
Not bundling this header would get ffmpeg stuck at SDK v6, which is
still freely available, holding back future development of the NVENC
encoder.
2016-08-28 16:47:54 +02:00
Marton Balint
13b90ff2c1
avformat: fix decoded creation_time timestamps
...
Use proper ISO 8601 timestamps which also signal that they are in UTC.
This changes the format of creation_time and modification_date metadata values
from 2016-06-01 22:30:00 to 2016-01-01T22:30:00.000000Z
Fixes ticket #5673 .
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-08-28 15:55:32 +02:00
Davinder Singh
fecf5ae9aa
MAINTAINER: add myself for Motion Estimation and Interpolation filters
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-28 13:48:23 +02:00
Jai Luthra
0c023d181e
lavc/lpc: Add min_shift parameter in LPC
...
The min_shift parameter is needed by the MLP encoder
Signed-off-by: Jai Luthra <me@jailuthra.in >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-28 11:18:16 +02:00
Paul B Mahol
88bcdf109a
avfilter: hflip,swapuv,vflip: add timeline support
2016-08-28 11:00:06 +02:00
James Almer
dc7e5adbc0
avformat/utils: fix a codecpar non use
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-27 11:21:12 -03:00
Paul B Mahol
f242d74d17
avfilter/vf_convolution: add >8 bit depth support
2016-08-27 16:04:07 +02:00
Paul B Mahol
b2c6a11fb6
avfilter/vf_atadenoise: add planes option
...
Make possible filtering only some planes.
2016-08-27 13:48:14 +02:00
Vittorio Giovara
69abf4f93c
vf_colorspace: Add support for full range yuv
...
Whenever a full range video is input, since the YUVJ* formats are not
listed as supported for this filter, a range reduction takes place
through the auto-inserted format filter, forcing the conversion to
operate on a limited range,
However the filter handles full range videos perfectly fine, so adding
support to YUVJ* formats will allow skipping a conversion step, while
providing completely identical results.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-27 13:08:43 +02:00
Vittorio Giovara
6648da3591
vf_colorspace: Check av_frame_copy_props() return value
...
This function can potentially allocate memory.
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-27 13:08:43 +02:00
Michael Niedermayer
c75273310c
avformat/utils: End probing if the expected codec surpasses AVPROBE_SCORE_STREAM_RETRY
...
Fixes Ticket5800
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-27 01:53:18 +02:00
Paul B Mahol
0429ff4be6
avfilter: add vaguedenoiser filter
2016-08-26 23:17:19 +02:00
Michael Niedermayer
0c7979b43d
avfilter/motion_estimation: Fix pre processor formating
...
IIRC, The spaces are not standard before the #
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-26 23:09:17 +02:00
Paul B Mahol
e3fbfa561e
doc/filters: fix anequalizer docs
2016-08-26 20:59:00 +02:00
James Almer
cf16d62076
tools/crypto_bench: add support for des
...
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-26 15:46:32 -03:00
James Almer
ba3f32d071
tools/crypto_bench: simplify gcrypt functions using a macro
...
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-26 15:46:29 -03:00
Michael Niedermayer
7827813f8c
avfilter/motion_estimation: Fix warning: variable dir_x set but not used
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-26 20:17:39 +02:00
Davinder Singh
b07d4a0fb2
avfilter: added motion estimation and interpolation filters
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-26 11:17:51 +02:00
Jan Sebechlebsky
bcd1153162
libavcodec/bsfs: Fix bsf option setting
...
AV_OPT_SEARCH_CHILDREN flag must be passed to av_opt_set_dict()
to set options for private context.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-26 02:10:42 +02:00
Burt P
ec220a8c1c
af_hdcd: av_frame_free(out) if av_frame_copy_props() fails
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-25 17:12:16 -05:00
Burt P
9d5e3c3f59
af_hdcd: for easier maintenance alongside libhdcd
...
Mostly just re-arranges some code to make it easier to update this
filter and libhdcd together. filter_frame() is much simpler as a
result.
* use the HDCD detection data structure and functions from libhdcd,
moved detection code out of filter_frame()
* moved analyze_mode preparation out of filter_frame() into
hdcd_analyze_prepare(), from libhdcd
* moved some macro definitions to the top so they are all together
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-25 17:11:57 -05:00
Vignesh Venkatasubramanian
42a635ddae
webm_chunk: Set pts precision to milliseconds
...
Milliseconds is the de-factor precision for timestamps in
Matroska/WebM media.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-25 22:22:28 +02:00
Derek Buitenhuis
425be3c810
mov: Remove old b-frame/video delay heuristic
...
This was added before edts support existed, and is no longer
valid.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-08-25 21:12:30 +02:00
Derek Buitenhuis
04f8d31287
mov: Remove ancient heuristic hack
...
This breaks files with legitimate single-entry edit lists,
and the hack, introduced in f03a081df0 ,
has no link to any known sample in its commit message.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-08-25 21:12:19 +02:00
Steven Liu
5006627843
tests/audiomatch: Fix compile warning
...
Making sure bestpos is initialized to zero to prevent gcc from kvetching.
It's harmless (although it's not obvious that it's harmless)
from code inspection:
tests/audiomatch.c: In function ‘main’:
tests/audiomatch.c:40: warning: ‘bestpos’ may be used uninitialized in this function
Thanks to Moritz Barsnick for first bringing this to the attention.
Signed-off-by: LiuQi <liuqi@gosun.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-25 18:37:29 +02:00
Michael Niedermayer
e1ced854f2
avfilter/af_acrusher: Rename sun/sov
...
The names are hard to understand and also seem to break build on at least some solaris
versions
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-25 18:36:59 +02:00
Paul B Mahol
feb2ea6e09
avfilter: add yuvtestsrc source filter
2016-08-25 11:16:09 +02:00
Paul B Mahol
5d7743019b
avfilter: add lut2 filter
2016-08-25 11:16:09 +02:00
Michael Niedermayer
01aee8148d
avcodec/exr: Check tile positions
...
This also disabled the case of mixed x/ymin with tiles, the code
handles these cases inconsistent for the 2 coordinate axis and is
unlikely working correctly.
Fixes crash
Fixes: poc1.exr, poc2.exr
Found-by: Yaoguang Chen of Aliapy unLimit Security Team
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-25 02:40:59 +02:00
Burt P
8a78fc5b01
af_hdcd: check return value of av_frame_copy_props()
...
Anton Khirnov:
"[av_frame_copy_props()] potentially contains memory allocation,
so the return value needs to be checked."
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-24 09:08:45 -05:00
Burt P
0cfe6acbe4
fate: add test for af_hdcd analyze mode
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-24 09:08:29 -05:00
Paul B Mahol
0edfd8e6f4
avfilter/vf_lut: add planar RGB support
2016-08-24 08:30:22 +02:00
Paul B Mahol
35a0bc0d94
fate: update for gbrap after 61980dc479
2016-08-24 08:08:39 +02:00
Carl Eugen Hoyos
c1de1f0469
lavf/movenc: Add a missing assignment if memory allocation fails.
...
Fixes a warning:
libavformat/movenc.c:5947:17: warning: statement with no effect [-Wunused-value]
2016-08-24 07:38:19 +02:00
Paul B Mahol
61980dc479
avformat/avcodec: support rawvideo with planar rgb and alpha in nut
2016-08-23 16:52:21 +02:00
Rafaël Carré
10e3f18c8d
libzvbi depends on ass
2016-08-23 15:28:36 +02:00
Paul B Mahol
68dc0c13f9
avfilter/vf_maskedmerge: add support for more pixel formats
2016-08-23 15:21:06 +02:00
Paul B Mahol
bb109dce18
avfilter: add hysteresis filter
2016-08-23 15:21:06 +02:00
Paul B Mahol
12f997d061
avfilter: add maskedclamp filter
2016-08-23 15:21:06 +02:00
Carl Eugen Hoyos
3c36d960f4
lavc/h264dec: Improve "Increasing reorder buffer" message loglevel.
...
Do not show the message for the first frame by default, show a
warning if increasing is necessary in the middle of the stream.
2016-08-23 15:05:06 +02:00
Michael Niedermayer
21f70940ae
avutil/mem: remove av_realloc / av_malloc incompatibility warning
...
memalign() is not guranteed to be compatible with free() or realloc()
and for platforms in this category we have --enable-memalign-hack
(which should be enabled automatically if such system is detected)
Trying to somehow half support systems that can free() memalign memory
but not reallocate it seems not worth the amount of work needed to
keep 2 then incompatible allocation systems and ensure their
seperation. That is unless this would affect a major platform
on which we want to avoid the memalign hack code
The warnings also cause wasted time and effort as people try
to maintain a separation that does not exist currently.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-23 13:50:19 +02:00
Erkki Seppälä
9d5ea8de56
libavformat/utils: added ability to probe AVMEDIA_TYPE_DATA format
...
Now force_codec_ids supports AVMEDIA_TYPE_DATA and
avformat_query_codec accepts data codecs as well in addition to video,
audio and subtitle tracks.
Signed-off-by: Erkki Seppälä <erkki.seppala.ext@nokia.com >
Signed-off-by: OZOPlayer <OZOPL@nokia.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-23 13:07:30 +02:00
Michael Niedermayer
77bf96b047
avcodec/aacenc: Tighter input checks
...
Fixes occurance of NaN/Inf leading to assertion failures and out of array access
Fixes: d1c38a09acc34845c6be3a127a5aacaf/signal_sigsegv_3982225_6121_d18bd5451d4245ee09408f04badd1b83.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-23 11:03:00 +02:00
Michael Niedermayer
76d377d0a0
swscale/output: Fix rounding offset in yuv2gbrp_full_X_c()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-23 02:46:02 +02:00
James Almer
69f7aad571
configure: force _WIN32_WINNT >= 0x0502 on mingw32 targets
...
Windows versions earlier than XP are not supported.
Should fix compilation of command line tools.
Tested-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-22 17:32:16 -03:00
Jan Sebechlebsky
b84c83144d
avformat/fifo: Add fate test
...
Tested-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-08-22 22:07:48 +02:00
Jan Sebechlebsky
0ed24bfc79
MAINTAINERS: Add myself as maintainer of fifo muxer
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-08-22 22:03:43 +02:00
Jan Sebechlebsky
92b5f8fecd
avformat: Add fifo pseudo-muxer
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-08-22 22:03:37 +02:00
Michael Niedermayer
360d3f3c18
doc&tools: Add murge script, for analyzing 3 way conflicts.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-22 18:54:03 +02:00
Michael Niedermayer
ebb9a320d7
avcodec/alsdec: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-22 17:36:56 +02:00
Stanislav Dolganov
4edd74bd7c
avcodec/me_cmp: add median SAD compare function
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-22 16:41:33 +02:00
Umair Khan
dcfd24b10c
avcodec/alsdec: Implement floating point sample data decoding
...
It conforms to the RM22 version of the reference encoder
Signed-off-by: Umair Khan <omerjerk@gmail.com >
2016-08-22 15:28:19 +02:00
Umair Khan
eabdabb982
avcodec: Implement masked lz decompression
...
Signed-off-by: Umair Khan <omerjerk@gmail.com >
2016-08-22 15:28:19 +02:00
Umair Khan
fb1f67a70b
avutil: Softfloat implementation for IEEE 754 floating point
...
Signed-off-by: Umair Khan <omerjerk@gmail.com >
2016-08-22 15:28:19 +02:00
Mark Reid
eb5f4b1482
tests/fate/vcodec: add dnxhr mov tests
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-22 12:59:54 +02:00
Jan Sebechlebsky
2fc9a3eb7a
avformat/mux: Restore original ts in write_packet on error
...
Restore original timestamps in write_packet() if the
actual write operation was not successfull. This allows
to pass the same packet to nonblocking muxer repeatedly
without corrupting the timestamps.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-22 12:59:54 +02:00
Burt P
429b41e7b2
doc/filters: re-order hdcd options to match --help filter=hdcd
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-22 04:37:54 -05:00
Mark Reid
61fac0ea09
libavcodec/dnxhdenc: fix typo, check if profile is dnxhr 444 or hqx
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-22 02:27:15 +02:00
Michael Niedermayer
d7633ed7a5
avformat/swfdec: Fix memleak on error
...
Fixes: 9eb9cf5b8c26dd0fa7107ed0348dcc1f/signal_sigabrt_7ffff6ae7c37_8925_1f676b5229d009f2b56dfd9e149fa6ba.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-22 01:29:51 +02:00
Timothy Gu
1ae4b1e09d
mem: Extend and edit Doxygen
2016-08-21 13:22:15 -07:00
Michael Niedermayer
cc5e5548df
avformat/wtvdec: Check pointer before use
...
Fixes out of array read
Fixes: 049fdf78565f1ce5665df236d90f8657/asan_heap-oob_10a5a97_1026_42f9d4855547329560f385768de2f3fb.wtv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-21 21:31:46 +02:00
Michael Niedermayer
67318187fb
libavcodec/wmalosslessdec: Check the remaining bits
...
Fixes assertion failure
Fixes: 24ebfda03228b5cc1ef792608cfba458/signal_sigabrt_7ffff6ae7c37_6473_3fa8a111dbc752b1a7c411c5ab79aaa4.wma
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-21 21:06:17 +02:00
Burt P
b7d1f44ce0
doc/filters: update for af_hdcd
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-21 13:50:02 -05:00
Burt P
0e0f8859ba
af_hdcd: PE table limits
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-21 13:48:46 -05:00
Burt P
accbb00ba7
af_hdcd: add AVOption to disable autoconversion in the filter graph
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-21 13:48:08 -05:00
Burt P
8c19732a42
af_hdcd: add AVOption to set the CDT period
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-21 13:47:20 -05:00
Burt P
400e2acd11
af_hdcd: Code comments update
...
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-21 13:47:01 -05:00
Paul B Mahol
45e5d5f547
avfilter/avf_showvolume: calculate color table only once
2016-08-21 16:49:18 +02:00
Steven Liu
445c30ba07
lavf/hlsenc: add append_list flag into hlsenc
...
When ffmpeg exit by exception, start a new ffmpeg will
cover the old segment list, add this flag can continue
append the new segments into old hls segment list
Signed-off-by: LiuQi <liuqi@gosun.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-21 14:55:27 +02:00
Jan Sebechlebsky
57503fab4f
avcodec/bsf: Add custom item name function for bsf list
...
which will
construct string description of filter chain. This is
done using lazy-initialization, so there is no overhead
if item name is never accessed.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-21 11:54:53 +02:00
Paul B Mahol
4d7d74802d
avfilter/vf_crop: make possible to do exact cropping for subsampled videos
2016-08-21 10:06:48 +02:00
Steven Robertson
a3cab3d433
libavformat/mov: Accept known codepoints in 'colr'
...
This change relaxes the whitelist on reading color metadata in MOV/BMFF
containers. The whitelist on writing values is still in place.
As a consequence it also fixes an apparent bug in reading 'nclc' values.
The 'nclc' spec [1] is in harmony with ISO 23001-8 for the values it
lists, but the code getting removed was remapping 5->6 and 6->7 for
primaries, which is incorrect, and was remapping 6->5 for color matrix
("colorspace" in the code), which is equivalent but an unnecessary
inconsistency. This logic error doesn't appear in movenc.
Removing the whitelist allows proper conversion when the source codec
relies on the container for proper signaling of newer codepoints, such
as DNxHR and VP9. If converting to a codec or container that has updated
its spec to include the new codepoints, the metadata will be preserved.
If going back to MOV/BMFF, the output whitelist will still kick in, so
this won't result in out-of-spec files being created.
[1] https://developer.apple.com/library/mac/technotes/tn2162/_index.html
Signed-off-by: Steven Robertson <steven@strobe.cc >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-21 02:58:24 +02:00
Steven Robertson
cf7b0b5050
fate: add DNxHR 12-bit example.
...
Signed-off-by: Steven Robertson <steven@strobe.cc >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-21 02:58:13 +02:00
Michael Niedermayer
f2a9a30fd6
avcodec/adpcm: Fix adpcm_ima_wav padding
...
Fixes out of array read
Fixes: f29f134ea5f5590df554a7733294a587/asan_stack-oob_309d14e_9188_ea01743d6355aff20530f3d4cdaa841a.wav
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-21 02:44:15 +02:00
Michael Niedermayer
2624695484
avcodec/svq3: fix slice size check
...
Fixes out of array read
Fixes: 09f46aa2175cade93e3e3932646a56a9/asan_heap-oob_4a5385_2995_498f6abfdc0248288cefe5f4b7ad316c.mov
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-20 22:11:50 +02:00
Michael Niedermayer
8b43ee4054
avformat/mov: Check STSD atom more completely
...
Fixes out of array read
Fixes: 13262c363a28da8d6bdcc472aed6e9dc/asan_heap-oob_cfb5e2_3733_31cf3fcc783295c34222eb070a784f84.3gp
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-20 20:16:52 +02:00
Michael Niedermayer
a31e08fa1a
avcodec/diracdec: Check numx/y
...
Fixes division by 0
Fixes: 60261c4469ba3e11059890fb2832a515/asan_generic_135e694_2790_beb94eaa0aeb7d11c0437375a8964a99.drc
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-20 19:36:01 +02:00
James Almer
27ee70290e
avfilter/window_func: use a constant instead of acosh()
...
Should fix compilation with non C99 compilers like msvc 2012, where
acosh() is not available.
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-20 11:50:58 -03:00
Roger Pack
18ce63a60e
avdevice/dshow: satisfy alloc contract better
...
prevent non-rgb24 crashes on windows 10 anniversary ed
Signed-off-by: Roger Pack <rogerpack2005@gmail.com >
2016-08-20 12:06:50 +02:00
James Almer
a8e3833a61
x86/avf_showcqt: use the FMULADD_PS x86util macro
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-20 02:12:33 -03:00
Michael Niedermayer
15dd56c093
avcodec/h2645_parse: fix nal size
...
Found-by: <durandal_1707>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-20 00:40:43 +02:00
Michael Niedermayer
528171ba84
avcodec/h2645_parse: Use get_nalsize() in ff_h2645_packet_split()
...
This fixes several regressions in h.264
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-20 00:39:07 +02:00
Michael Niedermayer
f10ea03df3
avcodec/h264_parser: Factor get_avc_nalsize() out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-20 00:36:38 +02:00
Michael Niedermayer
b8b3671721
avcodec/cfhd: Increase minimum band dimension to 3
...
The implementation does not currently support len=2
Fixes out of array accesses
Fixes: 29d1b3db5ba2205e82b0b3a533e057a3/asan_heap-oob_12b650c_9254_3b8c4e4d931eb2c32841c18ebb297f1d.avi
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-19 22:28:32 +02:00
Paul B Mahol
0d8b6a15dd
avfilter/vf_histogram: make foreground and background opacity configurable
2016-08-19 18:03:07 +02:00
Michael Niedermayer
ca906e8190
avformat/movenc: Free extradata after successfull allocation of new instead of before
...
This avoids erroring out with extradata lost and extradata size mismatching
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-19 16:02:16 +02:00
Umair Khan
4f6f56114e
avformat/movenc: allow rewriting extradata
...
Signed-off-by: Umair Khan <omerjerk@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-19 15:30:52 +02:00
Michael Niedermayer
9ffe44c5c7
avcodec/indeo2: check ctab
...
Fixes out of array access
Fixes: 6b73fa392ac808f02e95a4e0a5770026/asan_static-oob_1b15f9a_1969_e7778535e5f27225fe0d6ded14721430.AVI
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-19 14:24:13 +02:00
Michael Niedermayer
a453bbb68f
avformat/swfdec: Fix inflate() error code check
...
Fixes infinite loop
Fixes endless.poc
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-19 11:00:02 +02:00
Michael Niedermayer
2a3720bc22
avformat/swfdec: Move packet size check before side data allocation
...
Fixes memleak
Fixes: 9eb9cf5b8c26dd0fa7107ed0348dcc1f/signal_sigabrt_7ffff6ae7c37_8927_f14c2a6ae1ad0bbde2c94f1da50e7074.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-19 03:05:52 +02:00
Michael Niedermayer
237207645b
avcodec/rawdec: Fix bits_per_coded_sample checks
...
Fixes assertion failure
Fixes: 9eb9cf5b8c26dd0fa7107ed0348dcc1f/signal_sigabrt_7ffff6ae7c37_8926_4609a5c3f071d555d2d557625f9687b1.swf
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-19 02:28:31 +02:00
Michael Niedermayer
382a68b008
vcodec/h2645_parse: Clear buffer padding
...
Fixes use of uninitialized memory
Fixes: 044100cb22845944988a4bd821ff8074/asan_heap-oob_329927a_1366_c3de34ce9217dac820fbb46171031bbb.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-18 23:36:18 +02:00
Michael Niedermayer
cc13bc8c4f
avcodec/h2645: Fix NAL unit padding
...
The parser changes have lost the support for the needed padding, this adds it back
Fixes out of array reads
Fixes: 03ea21d271abc8acf428d42ace51d8b4/asan_heap-oob_3358eef_5692_16f0cc01ab5225e9ce591659e5c20e35.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-18 23:36:18 +02:00
Paul B Mahol
e2a39b103e
avfilter/avf_showvolume: use current peak value for picking colors
2016-08-18 20:14:58 +02:00
Paul B Mahol
b3c6e89d48
avfilter/avf_showspectrum: do not use uninitialized memory
2016-08-18 18:40:00 +02:00
Paul B Mahol
703ae350c2
avfilter/af_astats: fix flt(p) support
2016-08-18 15:30:05 +02:00
Paul B Mahol
81f7d07608
avfilter/af_astats: add support for s64(p) sample format
2016-08-18 15:30:05 +02:00
Paul B Mahol
fc600eff63
avcodec: add 64-bit signed pcm codec
2016-08-18 15:30:05 +02:00
Paul B Mahol
9876d8fc6d
swresample: add int64 sample format
2016-08-18 15:30:05 +02:00
Michael Niedermayer
30b2611ed3
swresample: Skip over dither steps if dithering scale is 0
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-18 11:52:11 +02:00
Michael Niedermayer
946acacdcd
swresample: move dither init up
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-18 11:50:14 +02:00
Carl Eugen Hoyos
f866f22c3f
lavf/pcmdec: Try to fix msvc compilation after 4c42d306.
2016-08-18 09:45:25 +02:00
James Almer
bba6a03b28
examples/demuxing_decoding: convert to codecpar
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-17 19:17:04 -03:00
Marton Balint
b72a7b96f8
avformat: factorize iso 8601 timestamp writer to a dictionary avutil function
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-08-17 23:45:41 +02:00
Carl Eugen Hoyos
a810126fd1
lavc/rscc: Fix colourspace for codec_tag RSCC and 32bpp.
2016-08-17 22:10:45 +02:00
Paul B Mahol
5ee5f4b13c
avfilter/avf_showfreqs: make minimum amplitude for log scaler configurable
2016-08-17 22:02:29 +02:00
Paul B Mahol
345c252e9c
avfilter/avf_showspectrum: unbreak dB legend
2016-08-17 22:02:29 +02:00
Stephen Hutchinson
f84cff8565
compat/avisynth: update AviSynth+ header
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-17 18:08:29 +02:00
Carl Eugen Hoyos
ec9d7047c4
ffmpeg: Do not set too large bits_per_raw_sample.
2016-08-17 18:08:16 +02:00
Carl Eugen Hoyos
4c42d30602
lavf/pcmdec: Map mime_type audio/L16 to the s16le demuxer.
...
Implements RFC 2586.
2016-08-17 18:07:24 +02:00
Clément Bœsch
fabff10244
lavf/version: fix belive/believe typo
2016-08-17 16:33:14 +02:00
Clément Bœsch
ffd71c9c5c
lavf: mark stream as const pointer in av_stream_get_side_data() for next bump
2016-08-17 16:32:09 +02:00
Clément Bœsch
b2016189db
lavf/utils: add some const to pointers parameters in a few functions
2016-08-17 16:17:42 +02:00
Clément Bœsch
2477775bf8
doc: add Libav merge document
2016-08-17 15:31:38 +02:00
Paul B Mahol
d299defbba
avfilter/Makefile & allfilters: sort entries
2016-08-17 13:37:39 +02:00
Paul B Mahol
ed8d7e7a9b
avfilter: add bitplanenoise filter
2016-08-17 13:24:28 +02:00
James Almer
f85842b09e
doc/APIChanges: fill in missing git hashes
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-16 23:23:50 -03:00
Jan Sebechlebsky
9023a4a30c
doc/APIchanges: Document addition of list BSF API in lavc
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-16 23:16:52 -03:00
Michael Niedermayer
0d98686fde
fate: Add RGB48 FFV1 test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 23:14:11 +02:00
Michael Niedermayer
62f5e601aa
avcodec/ffv1enc: Add RGB48 support
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 23:06:02 +02:00
Michael Niedermayer
a95fdac4c6
avcodec/ffv1enc: do not offset null pointers
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 23:05:27 +02:00
Michael Niedermayer
b1d1250938
avcodec/ffv1: Fix rgb plane ordering in experimental planar RGB
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 23:04:00 +02:00
Michael Niedermayer
87da118898
avcodec/ffv1enc: Factor rice high depth check out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 23:03:10 +02:00
Michael Niedermayer
ae0192ef5f
avformat/mov: Check extradata before access
...
Fixes NULL ptr dereference
Fixes Ticket5778
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 19:47:23 +02:00
Paul B Mahol
b438c2025c
avfilter/window_func: add cauchy, parzen and poisson window function
2016-08-16 18:09:50 +02:00
Jun Zhao
46bfc1562f
ffmpeg/qsv: fix QSV-accelerated transcode performance drop issue.
...
the merge commit 1b04ea1 "avconv: create simple filtergraphs earlier"
will init the filtergraphs earlier, then init the QSV transcode can't
suppose the nb_filters's value, else lead to the QSV transcode performance
drop.
Signed-off-by: Jun Zhao <mypopydev@gmail.com >
Reviewed-by: Ivan Uskov <ivan.uskov@nablet.com
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 17:09:33 +02:00
Paul B Mahol
a2c40931c8
avfilter/vaf_spectrumsynth: check return code
2016-08-16 16:01:35 +02:00
Paul B Mahol
1457786d69
avfilter/avf_showspectrum: do not let multiple threads to write to same part of memory
2016-08-16 15:56:12 +02:00
Paul B Mahol
ea58dd2beb
avfilter/window_func: add dolph window
2016-08-16 15:56:12 +02:00
Jon Toohill
c3c4c72665
lavc: add trailing_padding to AVCodecContext to match AVCodecParameters.
...
Shows encoder delay/padding in the stream summary if they are set.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-16 12:30:37 +02:00
Paul B Mahol
3282e31baa
avfilter/vf_atadenoise: set default size value to 9
...
This is enough, bigger sizes do not produce better output in 99% cases.
2016-08-15 23:04:08 +02:00
Paul B Mahol
fc3eb173f4
avfilter/vf_atadenoise: add support for more pixel formats
2016-08-15 23:00:28 +02:00
Paul B Mahol
4f226714f5
avfilter/af_astats: add support for other sample formats
2016-08-15 22:01:16 +02:00
Jan Sebechlebsky
b746ed70ef
avcodec/bsf: Add list BSF API
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-15 14:03:46 +02:00
Paul B Mahol
0ea03dbbf9
avcodec/iff: remove palette swapping for anim
...
It appears it is wrong.
2016-08-15 13:21:47 +02:00
Paul B Mahol
ce5ba77079
avfilter/avf_showspectrum: add some multithreading support
2016-08-15 13:17:06 +02:00
Paul B Mahol
4899953a47
doc/filters: add yet another zoompan usage example
2016-08-15 09:59:40 +02:00
Paul B Mahol
ac18114b96
avfilter/vf_zoompan: fix pzoom usage
2016-08-15 09:55:36 +02:00
Ivan Uskov
b93e223315
libavcodec/qsvdec_h2645.c: switch to the new BSF API
...
This patch applies same changes as commit e3dfef8e3c of libav:
instead of the obsolete AVBitStreamFilterContext now the new AVBSFContext filter is used to
restore annex-B prefixes.
Based-on: e3dfef8e3c by Anton Khirnov
Push requested by maintainer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-15 02:48:53 +02:00
Maya Rashish
23f505bee0
configure: All sun4 machines are SPARCs, not just sun4u
...
Allow building on sun4v
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-15 02:11:03 +02:00
Moritz Barsnick
d14993478c
libavformat/http: add support for content_type option in listen mode
...
Instead of silently ignoring the content_type option in listen mode,
apply its value to the provided "Content-Type:" header.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-14 10:44:38 +02:00
Paul B Mahol
ec4ed2f69c
avfilter/vf_signalstats: fix saturation calculation for >8 bit
2016-08-14 10:00:35 +02:00
Rostislav Pehlivanov
6612d04933
aacenc: fix various typos and an error message
...
Too much copy and pasting.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-08-13 17:34:58 +01:00
Rostislav Pehlivanov
fb0abb34cb
aacenc: unmark the fast coder as experimental
...
This version has had much testing so there's little point in keeping it
maked as experimental.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-08-13 17:00:03 +01:00
Rostislav Pehlivanov
c92cc2d559
aacenc: add a faster version of twoloop as the "fast" coder
...
Does nothing fancy but still sounds very decent at 128kbps.
Still room to improve by bringing in the low pass and PNS management
from the main big twoloop which should improve its quality but not
sacrifice that much speed.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-08-13 17:00:03 +01:00
Paul B Mahol
3a81775bde
avfilter/vf_signalstats: measure video bitdepth
2016-08-13 12:57:09 +02:00
Paul B Mahol
ee56d9bc89
avfilter/vf_signalstats: add >8 bit depth support
2016-08-13 12:57:09 +02:00
Jan Sebechlebsky
7ae52f8a6b
avcodec/bsf: Add ff_bsf_get_packet_ref() function
...
Use of this function can save unnecessary malloc operation
in bitstream filter.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-13 12:46:18 +02:00
Carl Eugen Hoyos
79dc94a63b
configure: Check for arc4random() header definition.
...
Fixes Cygwin compilation.
2016-08-13 12:14:01 +02:00
Jan Sebechlebsky
2ab52644ee
doc/bsfs: Fix bsf options divider in documentation
...
The actual implementation uses ':' divider, not '/' as
documented.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-13 11:05:24 +02:00
Jan Sebechlebsky
bfdca87ab5
avcodec/bsf: Forbid packet without payload in av_bsf_send_packet
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-13 10:59:50 +02:00
Jan Sebechlebsky
7d5501be1e
avcodec/bsf: Set EOF flag only in pkt == NULL
...
Set BSF EOF flag only if pkt == NULL in av_bsf_send_packet().
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-13 10:59:50 +02:00
Carl Eugen Hoyos
ceab04fb5d
lavc/raw: Support QT b64a ARGB64 rawvideo.
...
Decoder based on a patch by v0lt, v0lt rambler ru
Fixes ticket #5657 .
2016-08-13 01:44:52 +02:00
Carl Eugen Hoyos
bc70312654
lavc/screenpresso: Fix 32bit pix_fmt, there is no transparency.
...
Fixes a remaining issue of ticket #5025 .
2016-08-13 01:35:10 +02:00
Petru Rares Sincraian
777697a62c
fate: add test for compand filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-12 23:54:04 +02:00
Mark Reid
44ac2b9b08
tests/fate/vcodec: add dnxhr edge tests
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-12 23:26:33 +02:00
Mark Reid
6051bb338c
libavcodec/dnxhdenc: add edge emulate for dnxhr
...
Fixes handling for resolutions that are not multiples of 16.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-12 23:25:36 +02:00
Aman Gupta
b5f30fe8fe
avcodec/utils: only warn when passed invalid lowres value
...
This makes it easier to use the lowres option when dealing with input
files in different codecs. If the codec doesn't support lowres=1 for
instance, it will throw a warning and use lowres=0 instead of erroring
out completely.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-12 16:34:20 +02:00
Moritz Barsnick
e8b355a028
libavformat/http: add support for headers option in listen mode
...
Instead of silently ignoring the headers option in listen mode, use
the provided headers.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-12 00:20:26 +02:00
Paul B Mahol
17eb0042bc
doc/filters: move hdcd documentation from video section to audio section
2016-08-11 22:21:29 +02:00
Paul B Mahol
b5314333de
avfilter/af_adelay: make it possible to delay channels by exact number of samples
2016-08-11 21:46:06 +02:00
Stephen Hutchinson
0ed5c3ce81
avisynth: simplify the pix_fmt check for the newer AviSynth API
...
The values don't need to be hardcoded since the correct values are
returned by avs_bits_per_pixel.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-11 19:55:16 +02:00
Martin Storsjö
2e95054ebb
checkasm: h264dsp: Initialize the padding area
...
This fixes valgrind warnings about conditional jumps based on
uninitialized data (even though the uninitialized data only ever
was compared with a direct copy of the same uninitialized data).
Signed-off-by: Martin Storsjö <martin@martin.st >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-11 19:55:16 +02:00
Paul B Mahol
eb3137255f
avfilter/avf_avectorscope: fix initialization for prev_y in polar mode
2016-08-11 17:30:32 +02:00
Paul B Mahol
a130165ed9
avfilter/avf_avectorscope: add scale option
2016-08-11 17:21:54 +02:00
Paul B Mahol
369fdfaf00
doc/filters: fix typo in acrusher filter docs
2016-08-11 15:26:14 +02:00
Paul B Mahol
7f1b14bc57
avfilter: add acrusher filter
2016-08-11 15:02:16 +02:00
Michael Niedermayer
cc6a59d2b9
avformat/id3v2: fix memleak with empty strings
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-11 14:10:19 +02:00
Matthias Hunstock
b83d907780
libavformat/mxfenc: add UID for unconstrained H.264 coded video in baseline profile
...
Enable the MXF muxer to mux baseline H.264 video streams.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-11 02:09:16 +02:00
Burt P
16ea0bca14
avfiltergraph.c: restore disabling of auto conversions
...
Restore a check added in 440af105f2
but lost sometime after. avfilter_graph_set_auto_convert() will
have an effect once again.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-10 11:37:28 -05:00
Paul B Mahol
80262d8c86
avfilter/avf_showwaves: add sqrt and cbrt amplitude scalers
2016-08-10 11:34:04 +02:00
Paul B Mahol
4506f91185
avfilter/vf_remap: >8 bit support
2016-08-10 10:02:05 +02:00
Michael Niedermayer
369ed11e3c
avfilter/drawutils: Fix single plane with alpha
...
Fixes Ticket5720
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-09 12:42:57 +02:00
Paul B Mahol
011837285f
doc/filters: add one more lutyuv example
2016-08-09 12:35:01 +02:00
Derek Buitenhuis
26695aedc2
docs/filters: Fix parameter names for colorspace filter
...
They were erroneously set to the name of the unit instead of
the parameter name.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-08-08 23:39:31 +02:00
Michael Niedermayer
65298a192a
avformat/id3v2: Mark variable as unused to avoid "set but not used" warning
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-08 18:37:07 +02:00
Michael Niedermayer
6aa39080cc
avcodec/rawdec: Fix palette handling with changing palettes
...
Fixes out of array access
Fixes: poc.swf
Found-by: 连一汉 <lianyihan@360.cn >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-08 18:37:07 +02:00
Hendrik Leppkes
3bf142c773
cmdutils: remove the current working directory from the DLL search path on win32
...
Reviewed-by: Matt Oliver <protogonoi@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-08 18:36:55 +02:00
Burt P
dbd7a84c81
af_hdcd: Don't warn if converting from AV_SAMPLE_FMT_S16P
...
Also checking AVFilterLink->type is AVMEDIA_TYPE_AUDIO before
calling av_get_sample_fmt_name() on AVFilterLink->format.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-08 11:17:27 -05:00
Burt P
b2b659b17d
af_hdcd: Add analyze mode
...
A new mode, selected by filter option, to aid in analysis of HDCD
encoded audio. In this mode the audio is replaced by a solid tone and
the amplitude is adjusted to signal some specified aspect of the process.
The output file can be loaded in an audio editor alongside the original,
where the user can see where different features or states are present.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-08 10:49:34 -05:00
Michael Niedermayer
ce2217b25e
avcodec/ffv1: add AV_PIX_FMT_GBRP16 support
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-08 00:32:09 +02:00
Michael Niedermayer
74314f1f5f
avcodec/ffv1: template functions to allow data types different from int16_t
...
This is required for >= 16bit RGB support
I tried it without templates but its too much duplicated code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-08 00:27:43 +02:00
Paul B Mahol
22d13e4290
avfilter/af_dynaudnorm: use better check for infinite loop
...
Apparently due to rounding this happens.
2016-08-07 23:47:04 +02:00
Paul B Mahol
571f33de0a
avfilter/avf_showspectrum: improve dB scale description
2016-08-07 20:21:52 +02:00
Yuli Khodorkovskiy
f0adb99d06
avcodec/qsvdec: Fix null dereferences in the qsv decoder
...
This patch fixes the h264_qsv decoder issues mentioned
in https://ffmpeg.zeranoe.com/forum/viewtopic.php?t=2962 .
The patch may be tested by specifying h264_qsv as the decoder to ffplay
for an h264 encoded file.
ffplay -vcodec h264_qsv foo.mts
Signed-off-by: Yuli Khodorkovskiy <ykhodo@gmail.com >
Push requested-by: Ivan Uskov
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-07 19:16:24 +02:00
Michael Niedermayer
bbec14de31
avcodec/raw: Fix decoding of ilacetest.mov
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-07 17:33:25 +02:00
Paul B Mahol
1562a4c4f3
doc/filters: reorganize some entries, move scale_npp to right section
...
Also remove select entry in audio section, probably error in merge.
2016-08-07 15:51:47 +02:00
Paul B Mahol
81fcd91265
doc/filters: fix typo in extrastereo docs
2016-08-07 11:22:42 +02:00
Vitaly Ostrosablin
90ddcaaf2d
avfilter: add crystalizer audio filter
...
Signed-off-by: Vitaly Ostrosablin <tmp6154@yandex.ru >
2016-08-07 10:58:42 +02:00
Chris Moeller
7387506b06
avformat: read id3v2 comment tags
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-07 04:23:24 +02:00
James Almer
d950279cbf
avcodec/ttadsp: cosmetics
...
Clean some header includes and use the same naming scheme as
in ttaencdsp
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-06 18:27:01 -03:00
Michael Niedermayer
803c058a6f
avformat/mov: Enable mp3 parsing if a packet needs it
...
Fixes Ticket5689
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-06 22:43:19 +02:00
James Almer
61da882cea
Merge commit '90944ee3ab79081845ea1bd97eea475031ce0842'
...
* commit '90944ee3ab79081845ea1bd97eea475031ce0842':
avconv: refactor selecting an encoder
Conflicts:
ffmpeg.c
ffmpeg_opt.c
Merged-by: James Almer <jamrial@gmail.com >
2016-08-06 13:31:12 -03:00
Burt P
2ce985c049
af_hdcd: convert AVOptions from INT to BOOL
...
As suggested by Timothy Gu.
Signed-off-by: Burt P <pburt0@gmail.com >
2016-08-06 11:16:58 -05:00
Michael Niedermayer
c1bfeda5a3
avcodec/ffv1enc: Fix assertion failure with non zero bits per sample
...
Fixes Ticket5736
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-06 02:22:15 +02:00
Carl Eugen Hoyos
82e53b3cef
lavc/vaapi_encode_h26x: Fix a crash if "." is not the decimal separator.
...
Fixes Debian bugs #831529 , #831909 , #832964 .
Signed-off-by: Mark Thompson <sw@jkqxz.net >
2016-08-05 21:24:54 +01:00
Matthias Hunstock
d8ee02a071
decklink: enhancement: format selection with AVRational v2
...
When finding a video mode based on frame size and frame rate,
use AVRational methods instead of simple comparison. Add debug information.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-05 21:33:43 +02:00
Matthias Hunstock
8431a6e654
decklink: fix: set fps on video stream v2
...
Provide the stream with the correct fps information when capturing.
Signed-off-by: Matthias Hunstock <atze@fem.tu-ilmenau.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-05 20:43:36 +02:00
Michael Niedermayer
be7150d497
avformat/teeproto: set forgotten url_close()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-05 18:59:21 +02:00
Andreas Cadhalpun
a16018461b
lavf: forward protocol_whitelist for the remaining cases
...
Also set a default_whitelist for mmsh and ffrtmphttp.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-05 16:18:49 +02:00
Paul B Mahol
04a8bbca92
avfilter/avf_showspectrum: add color rotation feature
...
Mostly useful with channel color scheme.
2016-08-05 12:18:56 +02:00
Shivraj Patil
6803a298f4
Support for MIPS cpu P6600
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-05 11:41:46 +02:00
Michael Niedermayer
1fb8f6b75c
avformat/img2enc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-04 23:22:54 +02:00
Michael Niedermayer
dd96a58473
avformat/hlsenc: Use AV_FRAME_FILENAME_FLAGS_MULTIPLE, support tee:
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-04 23:22:54 +02:00
Michael Niedermayer
82a33c8d85
avformat: Add av_get_frame_filename2() and AV_FRAME_FILENAME_FLAGS_MULTIPLE
...
This will be used to allow writing file sequences using the tee output onto
multiple places in parallel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-04 23:22:54 +02:00
James Almer
be63ef3c4e
avcodec/vdpau: clean up vdpau_internal.h
...
Also don't include it on files that don't need it.
This reduces differences with libav
Tested-by: Timothy Gu <timothygu99@gmail.com >
Reveiwed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-04 16:40:51 -03:00
James Almer
376d4b3c0d
avformat: add a TTA Muxer
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-04 16:25:40 -03:00
James Almer
ce944e8489
avformat/tta: remove custom crc callback function
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-04 16:25:36 -03:00
James Almer
155f4e9630
avformat/avio: add a crc callback function for CRC-32 IEEE-LE
...
Reviewed-by: Nicolas George <george@nsup.org >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-04 16:25:32 -03:00
Timothy Gu
f297d1e9e5
h264dec: Fix indentation
2016-08-04 11:16:44 -07:00
Timothy Gu
26648703db
ffmpeg_opt: Remove duplicated initialization of attachment stream
...
These two fields are already initialized to the same values in
new_attachment_stream().
2016-08-03 21:29:38 -07:00
Timothy Gu
e5c79cd854
Merge commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae'
...
* commit '5e1840622ce6e41c57d9c407604863d3f3dcc3ae':
avconv: fix handling attachments in init_output_stream
Conflicts:
avconv.c
This is functionally a no-op, as we don't have the bug this is trying to
fix. See 843be56ee1 .
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 21:28:43 -07:00
Timothy Gu
1b04ea1a6c
Merge commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee' into merge
...
* commit '73c6ec6d659bab11ac424a4ba6ce3a56246295ee':
avconv: create simple filtergraphs earlier
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 20:53:03 -07:00
Timothy Gu
9aa3023672
Merge commit '49670e4218d34899a1c37abb7a11615efc16f757'
...
* commit '49670e4218d34899a1c37abb7a11615efc16f757':
avconv: add a function for determining whether a filtergraph is simple
Conflicts:
avconv.c
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 20:33:57 -07:00
Timothy Gu
7f7cedd713
Merge commit '58640fe89ec4f2a3d67c0a2585fca8de34440857'
...
* commit '58640fe89ec4f2a3d67c0a2585fca8de34440857':
h264: handle frame recovery in h264_field_start()
Conflicts:
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 20:07:21 -07:00
Timothy Gu
de62531286
Merge commit 'e26c64148be8a20ace7512d96503172fb5e9753b'
...
* commit 'e26c64148be8a20ace7512d96503172fb5e9753b':
h264: discard slices of redundant pictures right after parsing the slice header
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
TODO: fix indentation
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 19:50:06 -07:00
Timothy Gu
e0c8250a59
Merge commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0'
...
* commit '6efc4638584e1e14d1a6152186ba28f5d48a80c0':
h264: always set redundant_pic_count during slice header parsing
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 19:09:19 -07:00
Timothy Gu
d3426fb592
Merge commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff'
...
* commit '606fb6c032fa44d9fa1efd4971308c228f2ebfff':
h264: call the hwaccel frame_start() from h264_field_start()
This commit is a noop, as it conflicts with 3e53211a57 .
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 17:47:06 -07:00
Timothy Gu
826c780c12
Revert "Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'""
...
This reverts commit e4af9be0f4 and redoes
796027f221 .
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-03 17:45:52 -07:00
Timothy Gu
e4af9be0f4
Revert "Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'"
...
This reverts commit 796027f221 , reversing
changes made to bca30ed2b6 .
Preemptive revert before further testing has been done.
2016-08-03 17:06:55 -07:00
Timothy Gu
796027f221
Merge commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22'
...
* commit 'd1d7678040cd60148f97b372cb4291bcc45b2e22':
h264: fix the check for mixed IDR/non-IDR slices
Conflicts:
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 15:59:51 -07:00
Timothy Gu
bca30ed2b6
Merge commit 'b13fc1e344011949929975a3451f78f226aa1de3'
...
* commit 'b13fc1e344011949929975a3451f78f226aa1de3':
h264: do not pass H264Context to h264_slice_header_parse()
Conflicts:
libavcodec/h264dec.h
Did not merge the h264_slice_header_parse() part. We use a few other
members of H264Context for error checking in that function.
Merged-by: Timothy Gu <timothygu99@gmail.com >
2016-08-03 15:41:59 -07:00
Paul B Mahol
4be8ab70a6
avfilter/af_astats: extend bitdepth calculation
2016-08-03 20:32:43 +02:00
Michael Niedermayer
b1ce800372
avformat/teeproto: Support parsing protocol options
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-03 19:40:26 +02:00
Michael Niedermayer
c5cc3b08e5
avformat/oggdec: Fix integer overflow with invalid pts
...
If negative pts are possible for some codecs in ogg then the code needs to be
changed to use signed values.
Found-by: Thomas Guilbert <tguilbert@google.com >
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-03 16:09:03 +02:00
Michael Niedermayer
6cd9a8b67a
ffplay: Fix invalid array index
...
Found-by: Thomas Guilbert <tguilbert@google.com >
Fixes: clusterfuzz_usan-2016-08-02
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-03 16:09:03 +02:00
Carl Eugen Hoyos
8916ad956a
doc/filters: Fix option ranges for the sab filter.
...
Fixes ticket #5751 .
2016-08-03 15:20:38 +02:00
Patrick Felt
e9659d1a0b
decklink: Remove unneeded spaces in initializers
2016-08-02 22:46:28 -07:00
Burt P
e0b8cba058
af_hdcd: add flags to AVOption defs
...
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
2016-08-02 22:40:23 -07:00
Timothy Gu
fd242479c6
mediacodec: Return ENOSYS on unsupported platforms
2016-08-02 22:32:12 -07:00
Timothy Gu
4e2a8c4920
jni: Return ENOSYS on unsupported platforms
2016-08-02 22:32:12 -07:00
Timothy Gu
58c7bf789f
doxygen: Standardize root-level modules
2016-08-02 22:15:25 -07:00
Timothy Gu
a4d7a6d1dd
mathematics: Extend and edit Doxygen
2016-08-02 21:53:34 -07:00
Timothy Gu
952c4cf7d0
rational: Extend Doxygen
2016-08-02 21:52:40 -07:00
Timothy Gu
f29ffbc87d
avutil/hash: Add more detailed Doxygen documentation
2016-08-02 21:49:52 -07:00
James Almer
613c86299f
avcodec/h264dec: move ff_h264_ps_uninit prototype to h264_ps.h
...
It's the proper place since 8c7932884d
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-03 00:36:09 -03:00
Steven Robertson
e1be80aa11
libavcodec/dnxhd: Enable 12-bit DNxHR support.
...
10- and 12-bit DNxHR use the same DC coefficient decoding process and
VLC table, just with a different shift value. From SMPTE 2019-1:2016,
8.2.4 DC Coefficient Decoding:
"For 8-bit video sampling, the maximum value of η=11 and for
10-/12-bit video sampling, the maximum value of η=13."
A sample file will be uploaded to show that with this patch, things
decode correctly:
dnxhr_hqx_12bit_1080p_smpte_colorbars_davinci_resolve.mov
Signed-off-by: Steven Robertson <steven@strobe.cc >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-03 03:17:32 +02:00
Timothy Gu
708d9e9fba
Doxyfile: Set STRIP_FROM_INC_PATH to project root
...
Show proper #include's on struct pages.
Before:
#include <buffer.h>
After
#include <libavutil/buffer.h>
2016-08-02 15:53:53 -07:00
Timothy Gu
ec234ccea4
mem: Order function prototypes semantically
2016-08-02 15:17:31 -07:00
Patrick Felt
5469293758
cosmetics: Correct comments in decklink_dec
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
2016-08-02 13:01:12 -07:00
James Almer
efc9d5c4bc
x86/ttaenc: add ff_ttaenc_filter_process_{ssse3,sse4}
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-02 15:48:04 -03:00
James Almer
7a9a8afc82
avcodec/ttaenc: split off hybrid filter processing as ttaencdsp
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-08-02 15:47:38 -03:00
Michael Niedermayer
35e7fc6030
avformat/tee: Factor parse_slave_options() out
...
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-02 20:22:55 +02:00
LoRd_MuldeR
8ab200fb8a
avfilter/af_dynaudnorm: improve pre-filling code
...
In order to avoid possible clipping at the very
beginning. Especially apparent when "alternative"
boundary mode is used.
Adopted from original commit by committer.
2016-08-02 20:00:44 +02:00
Paul B Mahol
82b84c71b0
avcodec/alacenc: allocate bigger packets
2016-08-02 18:41:11 +02:00
Timothy Gu
1fcf243216
mathematics: Make function prototypes identical to definitions
...
Doxygen gets confused by this.
2016-08-02 09:01:09 -07:00
Carl Eugen Hoyos
5aede05120
lavu/hwcontext_vaapi: Fix compilation if VA_FOURCC_ABGR is not defined.
...
Fixes ticket #5484 .
2016-08-02 17:07:41 +02:00
Timothy Gu
39211cb9aa
murmur3: Add Doxygen documentation
...
The interface has been stable for some time now.
2016-08-02 07:50:44 -07:00
Timothy Gu
0a7a4e33f3
avutil: Add detailed Doxygen description to a few hashes
2016-08-02 07:48:21 -07:00
Timothy Gu
19d7098c9e
avutil: Group hash functions separately in Doxygen
2016-08-02 07:48:08 -07:00
Timothy Gu
fbe22355b7
build: Make API documentation depend on config.mak
...
The Doxygen command is generated from the list of installed headers,
which may change per configuration (e.g. `--enable-gpl` results in
libpostproc to be built and installed).
2016-08-02 07:45:13 -07:00
Carl Eugen Hoyos
8ee113afa1
lavf/rmdec: Do not return EIO on EOF.
...
Reported-by: applemax82
2016-08-02 16:16:31 +02:00
Lucas Cooper
3d7ea1d39e
doc/filters: Add stats_version documentation to PSNR filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-02 12:50:06 +02:00
Petru Rares Sincraian
7be021d949
fate: add test for tremolo filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-02 12:50:04 +02:00
James Almer
01f0598b18
Merge commit '996f13413b0415097e2a184d161462ffb3ceb647'
...
* commit '996f13413b0415097e2a184d161462ffb3ceb647':
h264: fix warnings in fill_filter_caches_inter()
Conflicts:
libavcodec/h264_slice.c
See ef8f6464a5
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 19:11:08 -03:00
Burt P
bea17a3d57
af_hdcd: Warn if there is any resampling or format conversion in the link chain
...
HDCD is only encoded in s16@44100Hz. Scan the chain of AVFilterLinks
for any resampling or format conversion/truncation that might cause
problems for the filter and issue warnings.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-01 23:57:55 +02:00
Burt P
d574e22659
af_hdcd: Process stereo channels together, fix #5727
...
Issue #5727 : gain adjustment should only be applied if matching
gain value from a valid packet in both channels. The existing functions process
each channel separately, so it was not possible.
* New versions of hdcd_process(), hdcd_scan(), hdcd_integrate() named
hdcd_*_stereo() that process both channels together.
* target_gain applied will be the last matching target_gain.
* The old single channel functions remain as an option. They can be
used by: -af hdcd=process_stereo=0.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-01 23:57:55 +02:00
James Almer
517dd04f6d
Merge commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1'
...
* commit 'bc7f4268514624e1286ea76d27a89a56b4ee18e1':
h264: drop tests whether the codec id is AV_CODEC_ID_H264
Conflicts:
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 18:15:07 -03:00
James Almer
fd4eb56528
Merge commit '8281cd5cb80582d668ce0848e0e035b383f161f6'
...
* commit '8281cd5cb80582d668ce0848e0e035b383f161f6':
h264_cabac: drop an always true condition
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 16:46:57 -03:00
James Almer
f41048f6ec
Merge commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c'
...
* commit '5c2fb561d94fc51d76ab21d6f7cc5b6cc3aa599c':
h264: add H264_ prefix to the NAL unit types
Conflicts:
libavcodec/h264_parse.c
libavcodec/h264_parser.c
libavcodec/h264_slice.c
libavcodec/h264dec.c
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 15:11:05 -03:00
Burt P
12759cc034
af_hdcd: Move code detect/check into own function
...
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-01 19:48:32 +02:00
Burt P
b90d0ab4be
af_hdcd: add force_pe filter option
...
Used to attempt replication of some results from
http://www.audiomisc.co.uk/HFN/HDCD/Examined.html
May not be generally useful, defaults to off.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-01 19:48:28 +02:00
Burt P
6517177d97
af_hdcd: Improve error detection logging
...
* Moves the filter context member out of state and into HDCDContext
* More useful information when an error is detected
* Gives a location near where the error was detected
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-01 19:48:24 +02:00
Burt P
bbf0b4fa88
MAINTAINERS: Add myself for af_hdcd
...
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-01 19:47:54 +02:00
James Almer
4c121ad546
Merge commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0'
...
* commit '1cf2f3d334f52849aae2be868bad1e5fa5f59aa0':
h264_sei: drop an unnecessary h264dec.h include
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 13:04:30 -03:00
James Almer
7c8bf2dc2b
Merge commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29'
...
* commit 'b24dafe10572254ff0decc18b0d7c3d3707d5a29':
lavc: drop unnecessary h264dec.h includes
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 13:03:15 -03:00
James Almer
9ee1f03365
Merge commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4'
...
* commit '70b1dcef2d859ae6b3e21d61de928c3dd0cf1aa4':
h264: tighten the valid range for ref_frame_count
Conflicts:
libavcodec/h264_ps.c
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 13:02:20 -03:00
James Almer
8c7932884d
Merge commit 'f638b67e5790735f34620bf82025c9b9d6fc7216'
...
* commit 'f638b67e5790735f34620bf82025c9b9d6fc7216':
h264: move the parameter set definitions to a new header file
Conflicts:
libavcodec/h264_parse.h
libavcodec/h264_ps.c
libavcodec/h264dec.h
Merged-by: James Almer <jamrial@gmail.com >
2016-08-01 12:58:09 -03:00
Michael Niedermayer
77b0f3f26d
avcodec/vp9_parser: Check the input frame sizes for being consistent
...
Suggested-by: BBB
Fixed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-08-01 17:05:51 +02:00
Timothy Gu
fd2cde0234
Doxygen: Re-enable JAVADOC_AUTOBRIEF
2016-07-31 20:56:23 -07:00
Timothy Gu
04da20e58f
dynarray: Change AV_ to FF_ for AV_DYNARRAY_ADD
...
The header is not installed and the macro isn't used outside libavutil,
so it is obviously privat to libavutil. Make the name reflect that.
2016-07-31 10:19:03 -07:00
Michael Bradshaw
c9ae8be5a8
avformat/matroskaenc: fix Voids with size < 10
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-31 16:59:49 +02:00
Burt P
390eea61be
af_hdcd: give cdt expired counter a value for never set
...
The counter is now -1 if the code detect timer was never set,
and 0 if it was set but never expired.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-31 16:36:22 +02:00
Burt P
999c6b1da8
af_hdcd: fix a minor cosmetic annoyance
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-31 16:36:08 +02:00
Timothy Gu
cebad64d4f
Doxyfile: Reset unused options back to default
...
Silences a few warnings.
2016-07-30 19:52:28 -07:00
Timothy Gu
5522da9ee1
doxygen: Remove outdated EXPAND_AS_DEFINED
2016-07-30 19:52:24 -07:00
Alexey Tourbin
906ee41141
avfilter/af_stereowiden: fix read/write past the end of buffer
...
The stereowiden filter uses a buffer, s->buffer[], and a pointer
within the buffer, s->write, to implement inter-channel delays.
The loop which applies the delayed samples turns out to be faulty.
109 for (n = 0; n < in->nb_samples; n++, src += 2, dst += 2) {
110 const float left = src[0], right = src[1];
111 float *read = s->write + 2;
112
113 if (read > s->buffer + s->length)
114 read = s->buffer;
115
116 dst[0] = drymix * left - crossfeed * right - feedback * read[1];
117 dst[1] = drymix * right - crossfeed * left - feedback * read[0];
118
119 s->write[0] = left;
120 s->write[1] = right;
121
122 if (s->write == s->buffer + s->length)
123 s->write = s->buffer;
124 else
125 s->write += 2;
126 }
For one, the buffer gets written past its end in lines 119-120, before
the bound check is done in lines 122-123. This can be easily confirmed
by valgrind.
==3544== Invalid read of size 4
==3544== at 0x593B41: filter_frame (af_stereowiden.c:116)
==3544== Address 0xb1b03c4 is 4 bytes after a block of size 7,680 alloc'd
==3544==
==3544== Invalid read of size 4
==3544== at 0x593B66: filter_frame (af_stereowiden.c:117)
==3544== Address 0xb1b03c0 is 0 bytes after a block of size 7,680 alloc'd
==3544==
==3544== Invalid write of size 4
==3544== at 0x593B79: filter_frame (af_stereowiden.c:119)
==3544== Address 0xb1b03c0 is 0 bytes after a block of size 7,680 alloc'd
==3544==
==3544== Invalid write of size 4
==3544== at 0x593B7D: filter_frame (af_stereowiden.c:120)
==3544== Address 0xb1b03c4 is 4 bytes after a block of size 7,680 alloc'd
Also, using two separate pointers, s->write and read = s->write + 2,
does not seem to be well thought out. To apply the delay of s->buffer[],
it is enough to read the delayed samples at the current position within
the buffer, and then to store new samples at the same current position.
Thus the application of delayed samples can probably be best described
with a single pointer s->cur.
I also introduce a minor change to ensure that the size of s->buffer[]
is always a multiple of 2. Since the delay parameter is a float, it is
otherwise possible to trick the code into allocating off-by-one buffer.
2016-07-30 21:53:25 +02:00
Paul B Mahol
61d302dd52
doc/filters: mention HDMI output format for stereo3d filter
2016-07-30 15:17:21 +02:00
Timothy Gu
7204a6298b
doxygen: Set tab size to 4
2016-07-29 19:01:40 -07:00
Timothy Gu
6253e5676f
doxygen: Update Doxyfile for Doxygen 1.8.8
2016-07-29 19:01:40 -07:00
Timothy Gu
f198b8af72
doxygen: Fix PREDEFINED syntax
2016-07-29 19:01:40 -07:00
Timothy Gu
22df70e9ed
doxygen: Add a note on libavutil's modular nature
2016-07-29 19:01:40 -07:00
Chris Cunningham
52ec4cc09b
libavformat/matroskadec: Add test for seeking with codec delay.
...
Also cleanup parens for the skip_to_timecode check.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-30 01:02:41 +02:00
Lucas Cooper
bc9ce5f6be
avfilter: Add new format for PSNR stats log
...
Add an AVOption stats_version with a new header for V2 stats, which
specifies the stats log version and lists the fields that will be
present in the log (to ease parsing).
The primary motivation is to facilitate the addition of optional fields
to the log without breaking backwards compatibility, while making the
logs easier to parse.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-29 20:49:53 +02:00
Michael Niedermayer
0219dc6c07
avformat/rmdec: Clear extradata when extradata_size is cleared
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-29 12:12:18 +02:00
Clément Bœsch
a170365ae9
Merge commit '4e2f6212483ae1b2a4043cddf0a1cb001b476abc'
...
* commit '4e2f6212483ae1b2a4043cddf0a1cb001b476abc':
svq3: stop using H264Picture
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-29 11:20:55 +02:00
Clément Bœsch
ecf65c30cf
Merge commit '251cbb44003caf179fb17afbb8a6c56643c2a646'
...
* commit '251cbb44003caf179fb17afbb8a6c56643c2a646':
h264: create a new header for common h264 definitions
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-29 11:13:44 +02:00
Clément Bœsch
15b26e88cb
Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'
...
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa':
h264: rename h264.[ch] to h264dec.[ch]
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-29 11:01:36 +02:00
Clément Bœsch
7dda97fb86
Merge commit 'f651c6a259d4bc78f25db11d25df9256d5110bd3'
...
* commit 'f651c6a259d4bc78f25db11d25df9256d5110bd3':
h264: factor out setting frame properties / side data
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-29 10:39:57 +02:00
Clément Bœsch
cc0852bee3
Merge commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768'
...
* commit '19446dc5fff6a2f5ccd1a73db66e266255a5d768':
h264: drop unused NAL_FF_IGNORE
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-29 10:24:42 +02:00
Clément Bœsch
13872d2aa1
Merge commit 'bcd91f1644b46dd142c5355c8b742b27d9028903'
...
* commit 'bcd91f1644b46dd142c5355c8b742b27d9028903':
h264: move a per-field block from decode_slice_header() to field_start()
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-29 10:24:06 +02:00
Josh de Kock
238733f741
hapdec: remove unused memory.h include
...
Most systems have this, so it isn't really a problem to include it
even if it's not used, but some do not have memory.h as it is
non-standard. Since it's unused just remove it anyway.
2016-07-29 09:13:01 +01:00
Clément Bœsch
a63c73122e
Merge commit '17e7c03e12d1e4490921e7bffaeaa6b46a7ada4e'
...
* commit '17e7c03e12d1e4490921e7bffaeaa6b46a7ada4e':
h264: only allow ending a field/starting a new one before finish_setup()
This commit is a noop. According to Michael, after 8385e171 this commit
should not be necessary anymore.
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-29 09:59:36 +02:00
Stefano Sabatini
156b5bb9bf
lavf/mpegtsenc: add special case for handling timed ID3 packets
...
Set the stream_id to 0xbd (private_stream_id_1). Tools seem to assume
that value, and this is consistent with MPEG TS specification (ITU-T
H.222.0 section 2.12.3).
2016-07-29 08:47:41 +02:00
Petru Rares Sincraian
286368099a
fate: add test for stereotools filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-29 00:30:22 +02:00
Petru Rares Sincraian
08c1b6bb72
fate: add test for silenceremove filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-29 00:30:22 +02:00
Matthieu Bouron
83b9909398
Changelog: add entry for MediaCodec hwaccel
2016-07-28 16:11:52 +02:00
Zhao Zhili
65b2feb890
avutil/mem: fix memleak
...
The original code assumes av_realloc() will free ptr if size is zero.
The assumes is incorrect now.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-28 12:09:05 +02:00
Paul B Mahol
d7ae4f79d3
avfilter/f_drawgraph: add another slide mode
2016-07-28 10:30:06 +02:00
Clément Bœsch
37abc8cca2
lavfi/hdcd: fix style
2016-07-28 09:30:10 +02:00
Clément Bœsch
4791716c1d
lavfi/hdcd: mark pe_str as static and const
2016-07-28 09:29:20 +02:00
Burt P
fb91143ef1
af_hdcd: Report PE as being intermittent or permanent
...
The Peak Extend feature could be enabled permanently or only
when needed. This is now reported.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-28 02:26:57 +02:00
softworkz
70c1647a35
avformat/matroskaenc: Write duration early during mkv_write_header (Rev #3 )
...
Rev #2 : Fixes doubled header writing, checked FATE running without errors
Rev #3 : Fixed coding style
This commit addresses the following scenario:
we are using ffmpeg to transcode or remux mkv (or something else) to mkv. The result is being streamed on-the-fly to an HTML5 client (streaming starts while ffmpeg is still running). The problem here is that the client is unable to detect the duration because the duration is only written to the mkv at the end of the transcoding/remoxing process. In matroskaenc.c, the duration is only written during mkv_write_trailer but not during mkv_write_header.
The approach:
FFMPEG is currently putting quite some effort to estimate the durations of source streams, but in many cases the source stream durations are still left at 0 and these durations are nowhere mapped to or used for output streams. As much as I would have liked to deduct or estimate output durations based on input stream durations - I realized that this is a hard task (as Nicolas already mentioned in a previous conversation). It would involve changes to the duration calculation/estimation/deduction for input streams and propagating these durations to output streams or the output context in a correct way.
So I looked for a simple and small solution with better chances to get accepted. In webmdashenc.c I found that a duration is written during write_header and this duration is taken from the streams' metadata, so I decided for a similar approach.
And here's what it does:
At first it is checking the duration of the AVFormatContext. In typical cases this value is not set, but: It is set in cases where the user has specified a recording_time or an end_time via the -t or -to parameters.
Then it is looking for a DURATION metadata field in the metadata of the output context (AVFormatContext::metadata). This would only exist in case the user has explicitly specified a metadata DURATION value from the command line.
Then it is iterating all streams looking for a "DURATION" metadata (this works unless the option "-map_metadata -1" has been specified) and determines the maximum value.
The precendence is as follows: 1. Use duration of AVFormatContext - 2. Use explicitly specified metadata duration value - 3. Use maximum (mapped) metadata duration over all streams.
To test this:
1. With explicit recording time:
ffmpeg -i file:"src.mkv" -loglevel debug -t 01:38:36.000 -y "dest.mkv"
2. Take duration from metadata specified via command line parameters:
ffmpeg -i file:"src.mkv" -loglevel debug -map_metadata -1 -metadata Duration="01:14:33.00" -y "dest.mkv"
3. Take duration from mapped input metadata:
ffmpeg -i file:"src.mkv" -loglevel debug -y "dest.mkv"
Regression risk:
Very low IMO because it only affects the header while ffmpeg is still running. When ffmpeg completes the process, the duration is rewritten to the header with the usual value (same like without this commit).
Signed-off-by: SoftWorkz <softworkz@hotmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-28 02:06:55 +02:00
Anssi Hannula
04964ac311
avformat/hls: Fix missing streams in some cases with MPEG TS
...
HLS demuxer calls the subdemuxer avformat_find_stream_info() while
overriding the subdemuxer AVFMTCTX_NOHEADER flag by clearing it.
However, this prevents some streams in some MPEG TS streams from being
detected properly.
Simply removing the clearing of the flag would cause the inner
avformat_find_stream_info() call to take longer in some cases, without
a way to control it.
To fix the issue, do not clear the flag but propagate it to HLS demuxer.
To avoid the above-mentioned mandatory delay, the call to
avformat_find_stream_info() is dropped except in the HLS ID3 timestamped
case. The HLS demuxer user should be calling avformat_find_stream_info()
on the HLS demuxer if it wants to find the stream info.
The main streams are now created dynamically after read_header time if
the subdemuxer uses AVFMTCTX_NOHEADER (mpegts).
Subdemuxer avformat_find_stream_info() is still called for the HLS ID3
timestamped case as the HLS demuxer needs to know the packet durations
to properly interleave ID3 timestamped streams with MPEG TS streams on
sub-segment level.
Fixes ticket #4930 .
2016-07-28 01:24:57 +03:00
Anssi Hannula
83db3c84fa
avformat/hls: Move stream propagation to a separate function
...
Creation of main demuxer streams from subdemuxer streams is moved to
update_streams_from_subdemuxer() which can be called repeatedly.
There should be no functional changes.
2016-07-28 01:24:57 +03:00
Anssi Hannula
9884f17e34
avformat/hls: Use an array instead of stream offset for stream mapping
...
This will be useful when the amount of streams per subdemuxer is not
known at hls_read_header time in a following commit.
2016-07-28 01:24:57 +03:00
Anssi Hannula
4d85069e5d
avformat/hls: Sync starting segment across variants on live streams
...
This will avoid a large time difference between variants in the most
common case.
2016-07-28 01:24:57 +03:00
Anssi Hannula
9cb30f7a88
avformat/hls: Fix regression with ranged media segments
...
Commit 81306fd4bdf ("hls: eliminate ffurl_* usage", merged in d0fc5de3a6 )
changed the hls demuxer to use AVIOContext instead of URLContext for its
HTTP requests.
HLS demuxer uses the "offset" option of the http demuxer, requesting
the initial file offset for the I/O (http URLProtocol uses the "Range:"
HTTP header to try to accommodate that).
However, the code in libavformat/aviobuf.c seems to be doing its own
accounting for the current file offset (AVIOContext.pos), with the
assumption that the initial offset is always zero.
HLS demuxer does an explicit seek after open_url to account for cases
where the "offset" was not effective (due to the URL being a local file
or the HTTP server not obeying it), which should be a no-op in case the
file offset is already at that position.
However, since aviobuf.c code thinks the starting offset is 0, this
doesn't work properly.
This breaks retrieval of ranged media segments.
To fix the regression, just drop the seek call from the HLS demuxer when
the HTTP(S) protocol is used.
2016-07-28 01:24:57 +03:00
Anssi Hannula
60873bf992
avformat/utils: Fix find_stream_info not considering the extradata it found
...
Commit 9200514ad8 ("lavf: replace AVStream.codec with
AVStream.codecpar") merged in commit 6f69f7a8bf changed
avformat_find_stream_info() to put the extradata it got from
st->parser->parser->split() to st->internal->avctx instead of st->codec
(extradata in st->internal->avctx will be later copied to st->codecpar).
However, in the same function, the "is stream ready?" check was changed
to check for extradata in st->codecpar instead of st->codec, even
though st->codecpar is not yet updated at that point.
Extradata retrieved from split() is therefore not considered anymore,
and avformat_find_stream_info() will therefore needlessly continue
probing in some cases.
Fix that by checking for the extradata at st->internal->avctx where it
is actually put.
2016-07-28 01:24:57 +03:00
Burt P
c26305f6ae
af_hdcd: Add counter for cdt expirations
...
Adds a counter for when the "code detect timer" expired without
finding a valid packet.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-27 23:09:45 +02:00
Burt P
c7ba34b6ea
af_hdcd: more comments in state struct
...
Add some comments describing the fields in hdcd_state_t.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-27 23:09:26 +02:00
Burt P
91854b8ef6
af_hdcd: Improve HDCD detection
...
HDCD is now only considered detected if a valid packet
is active in both channels simultaneously.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-27 22:21:43 +02:00
Burt P
bfe9155aee
fate: Add HDCD filter tests for false positive and error detection
...
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-27 22:21:43 +02:00
Michael Niedermayer
8385e1718e
avcodec/h264_slice: Make setup_finished check cover more cases
2016-07-27 19:29:55 +02:00
Xinzheng Zhang
ad14aab3b4
avformat/flvdec: parse keyframe before a\v stream was created add_keyframes_index() when stream created or keyframe parsed
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-27 19:29:55 +02:00
Xinzheng Zhang
cd141e71bd
avformat/flvdec: splitting add_keyframes_index() out from parse_keyframes_index()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-27 19:29:55 +02:00
Clément Bœsch
6c41eda18e
Merge commit 'debca90863e4ee53447efd02483c500f89766384'
...
* commit 'debca90863e4ee53447efd02483c500f89766384':
h264: store {curr,max}_pic_num in the per-slice context
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-27 18:07:30 +02:00
Clément Bœsch
87d1f82059
Merge commit 'f966498e433fead2f5e6b5b66fad2ac062146d22'
...
* commit 'f966498e433fead2f5e6b5b66fad2ac062146d22':
h264: decode the poc values from the slice header into the per-slice context
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-27 17:31:18 +02:00
Clément Bœsch
f8ce1e8282
lavc/h264_slice: adjust a few line breaks to reduce diff with Libav
2016-07-27 17:24:48 +02:00
Clément Bœsch
78c7197ea0
Merge commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b'
...
* commit '54dd9b1cdd9e54f1ee39ae25af0324f8aba2831b':
h264: set mb_aff_frame in frame_start()
h264: move the block starting a new field out of slice_header_parse()
Both commits are merged at the same time in order to prevent a
regression with Ticket #4440 (see 38660128 ).
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-27 17:00:14 +02:00
Matthieu Bouron
376d8fb2c5
lavc/ffjni: replace ff_jni_{attach,detach} with ff_jni_get_env
...
If a JNI environment is not already attached to the thread where the
MediaCodec calls are made the current implementation will attach /
detach an environment for each MediaCodec call wasting some CPU time.
ff_jni_get_env replaces ff_jni_{attach,detach} by permanently attaching
an environment (if it is not already the case) to the current thread.
The environment will be automatically detached at the thread destruction
using a pthread_key callback.
Saves around 5% of CPU time (out of 20%) while decoding a stream with
MediaCodec.
2016-07-27 15:43:39 +02:00
Martin Storsjö
293676c476
libopenh264: Support building with the 1.6 release
...
This fixes trac issue #5417 .
This is cherry-picked from libav commit
d825b1a530 .
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-07-27 10:19:46 +03:00
Martin Storsjö
c5d326f551
Add an OpenH264 decoder wrapper
...
This is cherrypicked from libav, from commits
82b7525173 and
d0b1e6049b .
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-07-27 10:19:40 +03:00
James Almer
54a0a52be1
checkasm/vp9dsp: use declare_func_emms in check_loopfilter
...
Fixes checkasm failures on mmxext functions
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-26 22:16:21 -03:00
dericed
461073e809
ffprobe.xsd: add missing timecode attribute to frameSideDataType
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-27 00:42:13 +02:00
Josh de Kock
c2fcf4fa0b
avdev/jack: remove duplicated dispatch macros
...
The macros were moved to compat/dispatch_semaphore/semaphore.h after a libav merge, and were never removed from jack.c
2016-07-26 23:10:47 +01:00
Ronald S. Bultje
a4edaa0270
vp9: add mxext versions of the single-block (w=8,npx=8) h/v loopfilters.
...
Each takes about 0.1% of runtime in my profiles, and they didn't have
any SIMD yet so far (we only had simd for npx=16 double-block versions).
2016-07-26 15:59:07 -04:00
Ronald S. Bultje
7ca422bb1b
vp9: add mxext versions of the single-block (w=4,npx=8) h/v loopfilters.
...
Each takes about 0.5% of runtime in my profiles, and they didn't have
any SIMD yet so far (we only had simd for npx=16 double-block versions).
2016-07-26 15:59:07 -04:00
Ronald S. Bultje
726501a34e
vp9: add 32x32 idct AVX2 implementation.
...
About 1.8x speedup compared to AVX version for full IDCT. Other
sub-IDCT scenarios also see speedups. Full --bench output for
idct_32x32_add_{bpp}_${subidct}_${opt} (50k cycles):
nop: 16.5
vp9_inv_dct_dct_32x32_add_8_1_c: 2284.4
vp9_inv_dct_dct_32x32_add_8_1_sse2: 145.0
vp9_inv_dct_dct_32x32_add_8_1_ssse3: 137.4
vp9_inv_dct_dct_32x32_add_8_1_avx: 137.1
vp9_inv_dct_dct_32x32_add_8_1_avx2: 73.2
vp9_inv_dct_dct_32x32_add_8_2_c: 14680.8
vp9_inv_dct_dct_32x32_add_8_2_sse2: 2617.2
vp9_inv_dct_dct_32x32_add_8_2_ssse3: 982.9
vp9_inv_dct_dct_32x32_add_8_2_avx: 958.5
vp9_inv_dct_dct_32x32_add_8_2_avx2: 704.2
vp9_inv_dct_dct_32x32_add_8_4_c: 14443.1
vp9_inv_dct_dct_32x32_add_8_4_sse2: 2717.1
vp9_inv_dct_dct_32x32_add_8_4_ssse3: 965.7
vp9_inv_dct_dct_32x32_add_8_4_avx: 1000.7
vp9_inv_dct_dct_32x32_add_8_4_avx2: 717.1
vp9_inv_dct_dct_32x32_add_8_8_c: 14436.4
vp9_inv_dct_dct_32x32_add_8_8_sse2: 2671.8
vp9_inv_dct_dct_32x32_add_8_8_ssse3: 1038.5
vp9_inv_dct_dct_32x32_add_8_8_avx: 983.0
vp9_inv_dct_dct_32x32_add_8_8_avx2: 729.4
vp9_inv_dct_dct_32x32_add_8_16_c: 14614.7
vp9_inv_dct_dct_32x32_add_8_16_sse2: 2701.7
vp9_inv_dct_dct_32x32_add_8_16_ssse3: 1334.4
vp9_inv_dct_dct_32x32_add_8_16_avx: 1276.7
vp9_inv_dct_dct_32x32_add_8_16_avx2: 719.5
vp9_inv_dct_dct_32x32_add_8_32_c: 14363.6
vp9_inv_dct_dct_32x32_add_8_32_sse2: 2575.6
vp9_inv_dct_dct_32x32_add_8_32_ssse3: 2633.9
vp9_inv_dct_dct_32x32_add_8_32_avx: 2539.6
vp9_inv_dct_dct_32x32_add_8_32_avx2: 1395.0
2016-07-26 15:59:07 -04:00
Clément Bœsch
c6e900e925
lavfi/curves: fix meaningless const int returned value
...
Spotted-by: James Almer <jamrial@gmail.com >
2016-07-26 21:22:27 +02:00
Luca Barbato
e85d38c20a
librtmp: Avoid an infiniloop setting connection arguments
...
The exit condition was missing.
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
2016-07-26 12:05:29 -07:00
James Almer
be04c4aa00
avformt/matroskaenc: undo an accidental revert by commit 5d48e4ea
...
Commit 5d48e4eafa accidentally reverted changes
made to matroskaenc by commit 989a614b70 .
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-26 15:22:32 -03:00
Dmitry Vagin
dc151d138c
ffprobe: add missing PROGRAM_STREAM_TAGS case
...
ffprobe did not show tags with only '-show_entries programs'
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-26 19:22:47 +02:00
James Almer
fb91850fe1
avutil/frame: access avframe fields directly in get_frame_defaults()
...
The accessors are needed only from outside libavutil.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-25 17:37:18 -03:00
Josh de Kock
384251daff
lavd/libdc1394: distinguish between enumeration errors and no cameras found
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-25 19:39:13 +02:00
Kacper Michajłow
e947b75b1c
libavformat/rtpdec_asf: zero initialize the AVIOContext struct
...
This fixes crash in avformat_open_input() when accessing
protocol_whitelist field.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-25 19:39:13 +02:00
James Almer
0c75bd8e3c
avcodec/dnxhddata: move avpriv_dnxhd_parse_header_prefix to a header
...
It's a small and simple function that can be inlined.
This removes one private symbol and should reduce object dependencies with the next
major bump
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-25 12:19:39 -03:00
James Almer
26cb7232c3
Revert "lavc: always build dnxhddata"
...
This reverts commit 2adbea4e21 .
A better solution will follow in the next commit.
2016-07-25 12:19:31 -03:00
Carl Eugen Hoyos
71167f7f84
lavc/Makefile: Fix standalone compilation of the svq3 decoder.
...
Regression since 0bf5fd2e
2016-07-24 23:50:33 +02:00
Matthieu Bouron
2adbea4e21
lavc: always build dnxhddata
...
lavc/movenc rely on avpriv_dnxhd_parse_header_prefix declared by
dnxhddata.h since e47981dab7 .
Fixes a missing symbol error in lavc/movenc if the dnxhd encoder is not
enabled.
2016-07-24 22:57:06 +02:00
Carl Eugen Hoyos
9bd35a76fc
lavc/h264_ps: Be more verbose when truncating likely oversized PPS.
2016-07-24 20:21:37 +02:00
Ivan Uskov
b4054100f6
Revert "Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'"
...
This reverts commit d30cf57a7b , reversing changes made to
acc155ac55 . The commit d30cf57a7b
provided irrelevant code complexity and decoding slowdown. But the main disadvantage of this
commit is a decoder crash. So it should be reverted.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-24 18:36:26 +02:00
Clément Bœsch
308f9b1c49
lavfi/selectivecolor: add 16-bit support
2016-07-24 15:29:37 +02:00
Clément Bœsch
b8aaedcd01
lavfi/selectivecolor: fix picking black as neutral when alpha is present
2016-07-24 14:21:50 +02:00
Mark Reid
6108cb2ce3
tests/fate: add dnxhr encoding tests
...
added sws_flags flags and tested against x86_32
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-24 12:31:07 +02:00
Clément Bœsch
6e971f7d66
lavfi: bump minor after recent curves filter additions
2016-07-24 12:22:41 +02:00
Clément Bœsch
b470d81f4e
lavfi/curves: prefix init and uninit function names
2016-07-24 12:18:30 +02:00
Clément Bœsch
62a31aecf6
lavfi/curves: pass log ctx as void* instead of AVFilterContext*
2016-07-24 12:18:30 +02:00
Clément Bœsch
39c6d4a8c5
lavfi/curves: reindent after previous commit
2016-07-24 12:18:30 +02:00
Clément Bœsch
e30cdac14b
lavfi/curves: add 16-bit support
2016-07-24 12:18:30 +02:00
Clément Bœsch
f19f5b906d
lavfi/curves: move alloc and init of LUTs inside config_input()
...
This is needed in order to have different sizes of LUTs according to the
input.
2016-07-24 12:18:30 +02:00
Clément Bœsch
050f790594
lavfi/curves: dynamically allocate LUTs
...
This simplifies following commits.
2016-07-24 12:18:30 +02:00
Clément Bœsch
4eee06ae87
lavfi/curves: add various const where it makes sense
2016-07-24 12:18:30 +02:00
Clément Bœsch
51a873d441
lavfi/curves: remove pointless logging since the addition of plot option
2016-07-24 12:18:30 +02:00
Clément Bœsch
4a8f5f1fd8
lavfi/curves: add plot option
2016-07-24 12:18:30 +02:00
Clément Bœsch
5c14018fc4
lavfi/curves: do not automatically insert points at x=0 and x=1
...
There is actually a need for the origin and end point not to be defined.
We can not automatically insert them with the y value of the first and
last point as it will influence the curves in a wrong way.
Fixes #5397
2016-07-24 12:18:30 +02:00
Michael Niedermayer
783a2568b2
tests/fate/filter-audio: fate-filter-chorus: Randomly change parameters to some values which pass on arm/mips/x86-32/64
...
If this still doesnt give the same results on all platforms then this should be
disabled
Found-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-24 03:52:55 +02:00
Kacper Michajłow
69630f4d30
libavutil/opt: Small bugfix in example.
...
Fix const corectness and zero init the struct. This example code would actually crash when initializing string.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-24 00:41:15 +02:00
Jan Sebechlebsky
75bd5d3e2d
avformat/tee: Rescale ts using av_packet_rescale_ts
...
This ensures that AV_NOPTS_VALUE value is handled
correctly.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-07-23 20:02:05 +02:00
Mark Reid
ece12db4f1
libavcodec/dnxhdenc: add support for dnxhr encoding
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-23 14:07:43 +02:00
Mark Reid
cdca1902ab
libavcodec/dnxhdenc: add support for variable mircoblock counts
...
dnxhr has variable resolution, 8160 is the mb num for 1920x1080
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-23 14:07:37 +02:00
Mark Reid
c2cd1a5ea7
tests/fate/dnxhd: add dnxhr prefix tests
...
The data offset value in the prefix increases as the heights increases.
This test adds a tests for some common dnxhr heights.
can somebody add the following test footage to fate/dnxhd?
https://dl.dropboxusercontent.com/u/170952/fate/dnxhd/prefix-256x1536.dnxhr
https://dl.dropboxusercontent.com/u/170952/fate/dnxhd/prefix-256x1716.dnxhr
https://dl.dropboxusercontent.com/u/170952/fate/dnxhd/prefix-256x2048.dnxhr
https://dl.dropboxusercontent.com/u/170952/fate/dnxhd/prefix-256x2160.dnxhr
https://dl.dropboxusercontent.com/u/170952/fate/dnxhd/prefix-256x3212.dnxhr
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-23 13:54:13 +02:00
Mark Reid
e47981dab7
libavformat/movenc: add dnxhr compatibility for apple players
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-23 13:54:12 +02:00
Nikolay Aleksandrov
8ec599caa4
MAINTAINERS: add myself to the project server
...
I've been helping out with the project servers' maintenance and migration
to the new machine hosted in Telepoint's data center in Sofia, BG.
Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-23 11:13:06 +02:00
Chris Cunningham
d59820f6fe
libavformat/matroskadec: fix unsigned overflow to improve seeking
...
When seeking a file where codec delay is greater than 0, the timecode
can become negative after offsetting by the codec delay. Failing to cast
to a signed int64 will cause the check against skip_to_timecode to evaluate
true for these negative values. This breaks the "skip_to" seek mechanism.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-23 10:32:28 +02:00
Mark Reid
0a088dea3d
ffmpeg.c: copy video profile when using stream_copy
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-23 03:52:38 +02:00
Carl Eugen Hoyos
db8e8c9731
lavc/intrax8: Use correct printf specifier for size_t on Windows.
2016-07-22 19:23:01 +02:00
Jan Sebechlebsky
1c46e53dcc
avcodec/mpeg4_unpack_bframes_bsf: Check av_packet_from_data() return value
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 19:04:21 +02:00
Jan Sebechlebsky
8c997b3d3d
avcodec/mpeg4_unpack_bframes_bsf: Copy packet props
...
mpeg4_unpack_bframes_bsf bitstream filters constructs
resulting packet using av_packet_from_data() function.
This function however modifies only buffer (data) and leaves
other fields untouched, so the content of other fields
of the output packet is undefined.
It is working with old BSF API, since old API filters
just data and the packet fields are copied in
av_apply_bitstream_filters from input packet.
This change fixes the behaviour for the new BSF API.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 18:55:37 +02:00
Sasi Inguva
282477bf45
libx264: Increase x264 opts character limit to 4096
...
Signed-off-by: Sasi Inguva <isasi@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 16:37:44 +02:00
Steven Liu
41ad6d193a
doc/muxers: improve hlsenc description
...
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 16:31:30 +02:00
Steven Liu
6f07467831
doc/muxers: add hls_flags option description
...
Signed-off-by: Steven Liu <liuqi@gosun.com >
Reviewed-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 16:31:30 +02:00
Petru Rares Sincraian
fa393e3061
fate: add test for extrastereo filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 13:13:24 +02:00
Michael Niedermayer
e83a01def3
avformat/teeproto: Fix memset sizeof
...
Found-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 10:47:34 +02:00
James Zern
640c0962c0
libvpxenc,cosmetics: rename common fns vp8 -> vpx
...
+ the context struct
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Zern <jzern@google.com >
2016-07-21 20:51:13 -07:00
James Zern
2afddfe9bf
libvpxdec,cosmetics: rename common fns vp8 -> vpx
...
+ the context struct
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Zern <jzern@google.com >
2016-07-21 20:50:26 -07:00
Yong Lei
8dcfe43de0
avcodec/huffman: beautify: add space between #include and filename.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 03:14:07 +02:00
Michael Niedermayer
b9d77c1dfc
doc/protocols: Fix seperated typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-22 01:05:49 +02:00
Michael Niedermayer
697b2bbd54
avcodec/ffv1dec: Test extradata_size instead of extradata for better robustness
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-21 23:37:02 +02:00
Michael Niedermayer
38cc5c298c
avformat/mov: Do not allocate empty extradata
...
Fixes Ticket5723
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-21 21:55:18 +02:00
Michael Niedermayer
9264bb7e79
avfilter/vf_psnr: Fix rounding error in average_max
...
The intermediate was rounded to an integer
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-21 11:26:28 +02:00
Mark Reid
541731488e
libavformat/rawenc: add dnxhr raw format extension
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-21 04:15:15 +02:00
Jörn Heusipp
64131b87d6
libopenmpt: Add "date" to metadata.
...
Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-07-21 02:47:35 +01:00
Jörn Heusipp
840df1f193
libopenmpt: set stream duration and fix time base
...
Fix the confusion around the used time base.
Check size returned from avio_size()
Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de >
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-07-21 02:47:35 +01:00
Josh de Kock
4ed6edac76
docs/demuxers: add libopenmpt section
...
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-07-21 02:47:35 +01:00
Josh de Kock
9134d2df5b
libopenmpt: add subsong support
...
Signed-off-by: Josh de Kock <josh@itanimul.li >
2016-07-21 02:47:35 +01:00
James Almer
120f34b6ac
avformat/oggenc: add vp8 muxing support
...
Addresses ticket #5687
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-20 22:32:48 -03:00
James Almer
66408fce49
avformat: add an Ogg Video muxer
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-20 22:32:43 -03:00
James Almer
ec0e888e3a
Changelog: move a misplaced entry to the correct section
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-20 22:32:39 -03:00
Michael Niedermayer
3af1aba2be
avformat/mux: Fix some codecpar non uses
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-21 03:02:24 +02:00
Petru Rares Sincraian
3fd2ef922e
fate: add test for earwax filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-20 23:09:04 +02:00
Petru Rares Sincraian
7403dcc34e
fate: add test for dcshift filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-20 23:09:04 +02:00
James Almer
7a15cf42ee
x86/diracdsp: make ff_put_signed_rect_clamped_10_sse4 work on x86_32
...
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-20 13:43:38 -03:00
Mark Reid
41d7642a7b
libavcodec/dnxhd: add dnxhr profiles
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-20 13:40:06 +02:00
Jun Zhao
a06acfff76
ffmpeg_opt: Delete duplicate “hwaccel_output_format” option.
...
Delete duplicate “hwaccel_output_format” option.
Signed-off-by: Jun Zhao <mypopydev@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-20 12:07:38 +02:00
Vignesh Venkatasubramanian
134fe28981
libavcodec/libvpx: Add VPx alpha decode support
...
VPx (VP8/VP9) alpha encoding has been part of FFmpeg. Now, add the
ability to decode such files with alpha channel.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
2016-07-19 20:31:13 -07:00
Petru Rares Sincraian
2383618a40
fate: add test for chorus filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-20 02:53:42 +02:00
James Almer
1582e306a4
avformat/avlanguage: make av_convert_lang_to() internal
...
The header was never installed and the function is only used in libavformat
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-19 21:43:14 -03:00
James Almer
b3820cabad
avformat/oggenc: fix page duration calculation when granule differs from timestamp
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-19 21:12:18 -03:00
James Almer
5adfbd3918
avformat/oggparsevp8: fix pts calculation on pages ending with an invisible frame
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-19 21:12:10 -03:00
James Almer
114870dbc9
configure: add support for new CPUs
...
Add new -march values for Intel and AMD CPUs introduced with GCC 5 and 6, and
improve SunCC flags accordingly.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-19 20:45:48 -03:00
Michael Niedermayer
9bf3fdcd3c
avcodec/h264_slice: Move h264_init_ps() call into h264_field_start()
...
This was missing from f512e4a390
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-20 00:07:18 +02:00
Michael Niedermayer
fd1588919d
avcodec/h264: remove list_count and ref_count clearing
...
The code conflicts with moving the h264_init_ps() call point
Without this, ff_h264_parse_ref_count() fills ref and list count and
h264_init_ps() subsequently wipes them out on a "success" path.
Subsequently things crash as the wiped fields are used.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-20 00:02:12 +02:00
Petru Rares Sincraian
68f991d909
fate: add test for avfft
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-19 23:25:01 +02:00
Michael Niedermayer
64caafaeb1
avformat: Add tee protocol
...
Option passing support will be submitted seperately to the ML
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-19 18:41:19 +02:00
Clément Bœsch
21c081a246
lavc/h264: fix spacing before comment
2016-07-19 15:34:03 +02:00
Zhao Zhili
450cf400fc
avutil/mem: fix wrong comment
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-18 22:52:36 +02:00
Josh de Kock
daf421d2ab
MAINTAINERS: add myself for libopenmpt
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-18 20:10:29 +02:00
Aman Gupta
a49ed9e32d
avcodec/ccaption_dec: default rollup to row 10
...
This ensures that captions are written towards the bottom of the screen
when tuning into mid-stream. The row will be reset on the receipt of the
next PAC command. Row 10 was chosen as it corresponds to the value of
"0" in a PAC (see row_map in handle_pac()).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-18 01:34:56 +02:00
Aman Gupta
9ca9671458
avcodec/ccaption_dec: implement positioning for closed captions
...
Positioning math is based on the guidelines in https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-608
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-18 01:31:25 +02:00
James Almer
64d16fd7f5
tools/patcheck: add a couple more common typos
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-17 18:38:14 -03:00
Aman Gupta
309322ef65
avcodec/ccaption_dec: change write_char() to void as return value is unused
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-17 20:16:22 +02:00
Michael Niedermayer
af13967b64
MAINTAINERS: Add Aman Gupta for ccaption_dec
...
Anshul appears to have no time currently as he has not reacted to patches or mails
and Aman agreed to take over maintaince or help
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-17 20:01:38 +02:00
James Almer
d688f39dc4
cosmetics: fix some misspelled words
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-17 13:10:27 -03:00
Jörn Heusipp
f1eb6ddcb3
libavformat/libopenmpt: Fix memory leak in error path in read_header_openmpt().
...
Signed-off-by: Jörn Heusipp <osmanx@problemloesungsmaschine.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-17 16:20:46 +02:00
Michael Niedermayer
2b14204339
avcodec/dnxhddata: replace % by &
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-16 22:08:37 +02:00
James Almer
8f0434f85c
fate: fix apng tests dependencies
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-16 15:29:43 -03:00
James Almer
298f556af4
configure: add missing loongson dependencies
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-16 15:18:58 -03:00
Mark Reid
ed0dc14ebb
libavcodec/dnxhd: add support more dnxhr header prefixes
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-16 15:39:28 +02:00
Jan Sebechlebsky
df9cc7f0a9
avformat/tee: Use ff_format_output_open() function
...
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-07-16 01:30:01 +02:00
Jan Sebechlebsky
6a3515a5a4
avformat/utils: Add ff_format_output_open() function
...
Add ff_format_output_open utility function to wrap
io_open callback of AVFormatContext structure.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-07-16 01:29:44 +02:00
Jan Sebechlebsky
e144b86fa4
avformat/tee: Support flushing by writing NULL pkt
...
This will add support for flushing by writing NULL
packet to the tee muxer, which propagates the action
to slave muxers as expected.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-07-16 01:28:11 +02:00
Jan Sebechlebsky
3d7b5ad217
avformat/tee: Use ff_stream_encode_params_copy()
...
Use ff_stream_encode_params_copy() to copy encoding-related
fields (parameters) of stream.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-07-16 01:15:16 +02:00
Jan Sebechlebsky
1732d89403
avformat/utils: Add ff_stream_encode_params_copy()
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-07-16 01:15:00 +02:00
Josh de Kock
d52dd768a3
lavf: add libopenmpt demuxer
...
Fixes ticket #5623
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-15 20:59:25 +02:00
Steven Liu
b701ec4152
refine the method option describe of hlsenc doc
...
Signed-off-by: LiuQi <liuqi@gosun.com >
Reviewed-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-15 16:24:28 +02:00
Pavel Koshevoy
25ca74d314
Restore compatibility with powerpc-apple-darwin9-gcc-4.2.1
...
... and attempt to preserve compatibility with clang that was
introduced in 311a953c76 (untested)
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-15 13:58:54 +02:00
Clément Bœsch
77726d32a8
lavf/vplayerdec: Improve auto-detection.
...
Fixes the incorrect detection of 16_selma_OneFrame_QP39.yuv (gray16le
rawvideo) as vplayer format.
2016-07-15 10:36:05 +02:00
Carl Eugen Hoyos
e1023aa1dd
lavf/img2dec: Also auto-detect (unusual) uncompressed pcx.
2016-07-15 10:26:27 +02:00
Carl Eugen Hoyos
040b4e139b
lavf/img2: Remove ffv1-img.
...
The ffv1 format currently needs a container.
2016-07-15 10:25:02 +02:00
Burt P
c41718c0d0
af_hdcd: detect and report encoding errors and oddities
...
Count and report when a code is signaled but fails to match a known pattern.
For example try Līve - Secret Samadhi.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-14 22:09:00 +02:00
Burt P
5c7457c028
af_hdcd: only hdcd_update_info() when something changes
...
Only call hdcd_update_info() when the control code changes
instead of every frame, so the counters are more meaningful.
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-14 22:09:00 +02:00
Burt P
33fc4cc7c6
af_hdcd: fewer false positives by ignoring code_counterC in HDCD detection
...
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-14 22:09:00 +02:00
Steven Liu
e29d2d9c92
avformat/segment: remove the check_bitstream from segment
...
because the BSF logic was re-factored into a shareable
function and both av_write_frame and av_interleaved_write_frame use it it
Signed-off-by: LiuQi <liuqi@gosun.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-14 21:33:19 +02:00
Clément Bœsch
2c138b2c9b
Merge commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc'
...
* commit 'b25cd7540e7cba9868edc13817c0ce1ddef90ffc':
h264: pass a H2645NAL to slice header decoding
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-14 19:41:37 +02:00
Clément Bœsch
def8506766
Merge commit '523c4c5b70994f5cd1f192b68d07cf24b292ca05'
...
* commit '523c4c5b70994f5cd1f192b68d07cf24b292ca05':
fate: Add TrueMotion 2 RT tests
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-14 19:37:14 +02:00
Clément Bœsch
e28d66052d
Merge commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a'
...
* commit '906ffed9b1b8b06979eb656989aecacb1ae75a3a':
fate: Move Duck Truemotion 1 and 2 tests to vpx.mak
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-14 19:35:04 +02:00
Clément Bœsch
bec7145252
lavc/truemotion2rt: mark AVPacket* as const
2016-07-14 19:29:43 +02:00
Clément Bœsch
93c13886a2
Merge commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b'
...
* commit '470cd0c5fe6337b6cb5276b3f84400999450fc1b':
Add TrueMotion 2.0 Real Time decoder
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-14 19:27:39 +02:00
Clément Bœsch
87e9cefa91
lavc/codec_desc: move a few codecs out of the image codecs list
...
Also shuffle them a little to simplify next Libav merge.
2016-07-14 19:14:26 +02:00
Clément Bœsch
9e6bb3b6ee
fate/video: use FATE_VIDEO instead of FATE_SAMPLES_AVCONV
...
Consistent with the rest of the rules
2016-07-14 19:01:51 +02:00
Clément Bœsch
cd02df5256
Merge commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf'
...
* commit 'cc58656aca95b5ab517989a9524b9a2b1c5653cf':
fate: Add tests for MagicYUV
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-14 18:57:37 +02:00
Clément Bœsch
c3e2e842fa
Merge commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6'
...
* commit 'd78fd2fa21cde28465e40dd0be4446b1387d22a6':
Add MagicYUV decoder
Changes observed from Libav:
- many cosmetics (function renames/move, spacing, line breaks)
- MagicYUVContext.slices_size is now unsigned
- use of pixdesc (include fixed in FFmpeg)
- mention of "Lossless" in the long name dropped (also removed from
general.texi in FFmpeg)
- addition of the FF_CODEC_CAP_INIT_THREADSAFE caps
- use of qsort() instead of AV_QSORT() (NOT MERGED)
- use of AVCodecContext.{width,height} instead of AVCodecContext.coded_{width,height} (NOT MERGED)
See also 77f9c4b7aa
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-14 18:52:20 +02:00
Michael Niedermayer
a2c90d5f98
avformat/mux: Apply auto bsfs in av_write_frame() too
...
Reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-14 17:51:57 +02:00
Michael Niedermayer
de9674c5ea
avformat/mux: Factor do_packet_auto_bsf() out
...
Reviewed-by: Steven Liu <lingjiujianke@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-14 17:51:57 +02:00
Matthieu Bouron
6c8942cdfb
lavf/mov: fix stream extradata_size allocation
...
Fixes CID 1363963.
2016-07-14 09:18:39 +02:00
Rostislav Pehlivanov
f41e37b84f
dirac_vlc: prevent shifting a 0 by 64 bits when zeroing residue
...
Adding a check for bits == 0 would still make Coverity misdetect this,
so just revert to the normal way of setting the residue to 0.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-14 01:29:34 +01:00
Rostislav Pehlivanov
c4adcff976
dirac_vlc: add a SET_RESIDUE macro and fix recent regression
...
Can also be used in future cleanups since 99% of the time the leftover
appending will just append to an already empty residue.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-14 01:00:59 +01:00
Rostislav Pehlivanov
000eb01a7d
diracdec: fix unchecked byte length
...
Also drops the start variable since it's redundant.
Found by Coverity, fixes CID1363964
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-13 23:53:05 +01:00
Rostislav Pehlivanov
b2b12b2d4a
diracdec: fix maximum quantization index checks
...
Found by Coverity, fixes CID1363961 and CID1363962
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-13 23:40:06 +01:00
Rostislav Pehlivanov
9c0aba434e
dirac_vlc: remove redundant macro declaration
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-13 23:38:10 +01:00
Rostislav Pehlivanov
e24c31b656
dirac_vlc: fix undefined shifts
...
Shifting by more than 63 bits is undefined behavior, athough any
compiler not returning 0 after shifting by any amount would be insane.
Found by Coverity, fixes CID1363959 and CID1363960
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-13 23:35:03 +01:00
Michael Niedermayer
e879819e7b
avfilter/vf_uspp: Check for encoding failure
...
Fixes CID1363015
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-13 20:16:27 +02:00
Matthieu Bouron
57fa9608e4
Merge commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd'
...
* commit 'ec9f04423b82afa323e90f5b2c677be74302c1fd':
ffv1: Error out on unsupported format
This commit is a noop, the feature is already present in FFmpeg.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-07-13 17:40:56 +02:00
James Almer
fde9c5e424
fate: fix fate-vp8 dependencies
...
Fix the demuxer dependencies in some of the tests and remove the vp8 decoder
dependency for the stream copy tests
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-13 12:33:56 -03:00
Matthieu Bouron
a91c330a29
Merge commit '105998fb5ca3c343f5c8cb39ce3197f87a5e4d36'
...
* commit '105998fb5ca3c343f5c8cb39ce3197f87a5e4d36':
checkasm: Add tests for h264 idct
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-07-13 17:22:29 +02:00
Matthieu Bouron
495a40cecb
tests/checkasm: reduce cosmetic diff with libav
...
Chunk was not merged in ca5ec2bf51 .
2016-07-13 17:11:58 +02:00
Matthieu Bouron
354336490d
Merge commit '846a3e78a535f05ee61bb23a160f3378f041f751'
...
* commit '846a3e78a535f05ee61bb23a160f3378f041f751':
mov: Support prores with multiple stsd
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-07-13 16:56:20 +02:00
Matthieu Bouron
3c058f5701
Merge commit '76729970049fe95659346503f7401a5d869f9959'
...
* commit '76729970049fe95659346503f7401a5d869f9959':
mov: Implement support for multiple sample description tables
Notes:
* The sc->stsc_data[index].id checks have been moved from the mov_read_stsc
to mov_read_packet before the value is used in mov_change_extradata to
not break playback of samples with broken stsc entries (see sample of
ticket #1918 ).
* sc->stsc_index is now checked against sc->stsc_count - 1 before it
is incremented so it remains lesser than sc->stsc_count. Fixes a crash
with:
./ffmpeg -i matrixbench_mpeg2.mpg -t 1 -frag_duration 200k test.mov
./ffprobe -show_packets test.mov
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-07-13 16:34:54 +02:00
Martin Vignali
f2b08a0702
libavcodec/exr : cosmetics, rename variable in b44_uncompress func
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-13 14:56:27 +02:00
Vignesh Venkatasubramanian
acca56d962
libvpx: Enable vp9 alpha encoding
...
Chrome canary now supports decoding of VP9 streams with alpha
channel [1]. Add support to ffmpeg for creating such files.
[1] https://codereview.chromium.org/2096813002/
Reviewed-by: James Zern <jzern@google.com >
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
2016-07-12 23:19:50 -07:00
Burt P
7af44ce2f7
af_hdcd: don't log full HDCD stats if HDCD was not detected
...
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-12 22:55:04 +02:00
Burt P
0d8caeb41e
af_hdcd: integrate() renamed hdcd_integrate() to be consistent with the other function names
...
Signed-off-by: Burt P <pburt0@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-12 21:39:01 +02:00
Michael Niedermayer
2408f92678
avcodec/dirac_vlc: Fix avutil.h include
...
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-12 19:11:40 +02:00
James Almer
4acdbb1c6c
avformat/oggenc: always use the time base stored in the theora header
...
Fixes ticket #5704
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-12 11:24:30 -03:00
Michael Niedermayer
9157ac2f9c
avcodec/dirac_vlc: Fix mixed declaration and statements
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-12 13:30:52 +02:00
Rostislav Pehlivanov
a337cb7361
diracdec: fix #coeffs -> byte conversion
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-12 10:44:24 +01:00
Rostislav Pehlivanov
df1dc52195
diracdsp_init: add missing ARCH_X86_64 check
...
That SIMD is still x86_64 only for now.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-07-12 00:39:12 +01:00
Rostislav Pehlivanov
2094562923
diracdec: do not memset the entire coefficient buffer for HQ pictures
...
This is now handled by the slice decoding function.
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:41:32 +01:00
Rostislav Pehlivanov
dcad4677d6
diracdec: do not allocate and free slice parameters every frame
...
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:40:57 +01:00
Rostislav Pehlivanov
0eb0f93109
diracdec: implement a LUT-based Golomb code parser
...
Still much left to optimize, but it provides a significant performance
improvement - 10% for 300Mbps (1080p30), 25% for 1.5Gbps (4k 60fps) in
comparison with the default implementation.
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:40:28 +01:00
Rostislav Pehlivanov
c43485f707
diracdec: rewrite HQ slice decoding
...
Now coefficients are written to a buffer and are then dequantized by the
new SIMD dequantization functions. For the lower bands without enough
coefficients to fill a register (and hence they overwrite) the C version
of the dequantization function is used.
The buffer is per-thread and will be realloc'd if anything changes.
This prevents regressions and having to limit slice size.
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:38:45 +01:00
Rostislav Pehlivanov
09d89d9406
diractab: expose the maximum quantization index as a macro
...
Prevents having to have random magic values in the decoder and a
separate macro in the encoder.
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:38:01 +01:00
Rostislav Pehlivanov
b9c6c5f453
diracdec: decode HQ profile slices in rows
...
Siginificantly improves the performance.
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:34:54 +01:00
Rostislav Pehlivanov
17caae7202
diracdec: simplify golomb parsing and dequantization
...
In preparation for the following commits, this commit simplifies the
coefficient parsing and dequantization function. It was needlessly
inlined without much performance gain.
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:34:25 +01:00
Rostislav Pehlivanov
bd61f3c6bf
diracdsp: add SIMD for the 10 bit version of put_signed_rect_clamped
...
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:33:24 +01:00
Rostislav Pehlivanov
80721cc1ff
diracdsp: add dequantization SIMD
...
Currently unused, to be used in the following commits.
Signed-off-by: Rostislav Pehlivanov <rpehlivanov@obe.tv >
2016-07-11 23:30:11 +01:00
Carl Eugen Hoyos
244d22452c
lavc/Makefile: Fix standalone compilation of the lame encoder.
...
Also fix a possible issue with the mpegaudio audiotoolbox decoders.
Fixes ticket #5703 .
2016-07-11 23:21:19 +02:00
James Almer
f60b54902f
avformat/oggenc: make flac the default for oga muxer
...
This allows simpler selection of flac in ogg from the command line,
while following the RFC 5334 recommendation[1] for the oga extension.
[1] https://tools.ietf.org/html/rfc5334#section-10.3
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-11 13:08:19 -03:00
Ronald S. Bultje
70d418c7e6
Revert "PPC64: Add versions of functions in libswscale/input.c optimized for POWER8 VSX SIMD."
...
This reverts commit 1df908f33f . The expected
performance improvements are essentially non-existent.
2016-07-11 10:15:05 -04:00
Ronald S. Bultje
f0a2b6249b
vp9: add 16x16 idct avx2 (8-bit).
...
checkasm --bench, 10k runs, for *_add_${bpc}_${sub_idct}_${opt}, shows
that it's about 1.65x as fast as the AVX version for the full IDCT, and
similar speedups for the sub-IDCTs:
nop: 24.6
vp9_inv_dct_dct_16x16_add_8_1_c: 6444.8
vp9_inv_dct_dct_16x16_add_8_1_sse2: 638.6
vp9_inv_dct_dct_16x16_add_8_1_ssse3: 484.4
vp9_inv_dct_dct_16x16_add_8_1_avx: 661.2
vp9_inv_dct_dct_16x16_add_8_1_avx2: 311.5
vp9_inv_dct_dct_16x16_add_8_2_c: 6665.7
vp9_inv_dct_dct_16x16_add_8_2_sse2: 646.9
vp9_inv_dct_dct_16x16_add_8_2_ssse3: 455.2
vp9_inv_dct_dct_16x16_add_8_2_avx: 521.9
vp9_inv_dct_dct_16x16_add_8_2_avx2: 304.3
vp9_inv_dct_dct_16x16_add_8_4_c: 7022.7
vp9_inv_dct_dct_16x16_add_8_4_sse2: 647.4
vp9_inv_dct_dct_16x16_add_8_4_ssse3: 467.1
vp9_inv_dct_dct_16x16_add_8_4_avx: 446.1
vp9_inv_dct_dct_16x16_add_8_4_avx2: 297.0
vp9_inv_dct_dct_16x16_add_8_8_c: 6800.4
vp9_inv_dct_dct_16x16_add_8_8_sse2: 598.6
vp9_inv_dct_dct_16x16_add_8_8_ssse3: 465.7
vp9_inv_dct_dct_16x16_add_8_8_avx: 440.9
vp9_inv_dct_dct_16x16_add_8_8_avx2: 290.2
vp9_inv_dct_dct_16x16_add_8_16_c: 6626.6
vp9_inv_dct_dct_16x16_add_8_16_sse2: 599.5
vp9_inv_dct_dct_16x16_add_8_16_ssse3: 475.0
vp9_inv_dct_dct_16x16_add_8_16_avx: 469.9
vp9_inv_dct_dct_16x16_add_8_16_avx2: 286.4
2016-07-11 10:14:58 -04:00
Michael Niedermayer
a2550e7d2e
avcodec/iff: Check that there are enough bytes in dgb before reading
...
Fixes CID1361959
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-11 14:48:57 +02:00
Michael Niedermayer
9585c50942
avcodec/iff: remove useless ()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-11 14:44:27 +02:00
Michael Niedermayer
92139c1bd1
avcodec/mediacodecdec_h264: Fix occured typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-11 13:00:04 +02:00
Michael Niedermayer
37c658b56b
doc/muxers: Fix Thisimproves typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-11 12:55:29 +02:00
Steven Liu
b45a976ed4
add split_by_time flag for support splite mpegts segment at non-keyframe
...
support split hls segment at duration set by hls_time
Signed-off-by: LiuQi <liuqi@gosun.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-11 12:20:40 +02:00
Marton Balint
593987810e
avutil/parseutils: dont assume standard time when parsing a timestamp
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-07-11 01:06:23 +02:00
Michael Niedermayer
58dc8bbca4
avcodec/h264_refs: Assert that op is 0-2
...
Coverity fails to realize this
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-10 21:23:11 +02:00
Sami Hult
d4c8e93190
Changed metadata print option to accept general urls
...
This is an - once again - updated patch, that uses avio_write instead
of avio_puts to stream clean text output without null characters. Works
now for me as intended.
Changes metadata filter to accept general urls as file argument without
breaking former behaviour. As a byproduct, it also allows for writing to
file "-" if specified as "file:-".
Example:
ffmpeg -i test.wav -filter_complex "silencedetect=n=-40dB:d=0.1,ametadata=mode=print:file='pipe\:4'" -f null
Signed-off-by: Sami Hult <sami.hult@gmail.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-10 00:36:49 +02:00
Michael Niedermayer
e98ab799be
avcodec/vaapi_encode_h264: Use av_clip_uintp2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-10 00:36:20 +02:00
James Almer
fd6dbc5385
Revert "configure: Enable GCC vectorization on ≥4.9 on x86"
...
This reverts commit cb8646af24 .
This change has brough more issues than benefits, between compilation
time failures depending on flags used and code miscompilation causing
runtime crashes.
See the "[PATCH 2/2] configure: Enable GCC vectorization on ≥4.9"
thread in the ffmpeg-devel mailing list for the relevant discussion.
2016-07-09 16:00:06 -03:00
Clément Bœsch
3cdd5f4b7c
Revert "Merge commit '187d719760bd130f848194ec4a6bd476341914bb'"
...
This reverts commit c67aa7f287 , reversing
changes made to 46bd0e8e0d .
The merge should have been a noop as the support was added in
601c238854
2016-07-09 15:56:04 +02:00
Clément Bœsch
c67aa7f287
Merge commit '187d719760bd130f848194ec4a6bd476341914bb'
...
* commit '187d719760bd130f848194ec4a6bd476341914bb':
h264: Support AV_PKT_DATA_NEW_EXTRADATA
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 15:03:27 +02:00
Clément Bœsch
46bd0e8e0d
Merge commit '75872d77d215d64b8d9430df23c6c74ff921227b'
...
* commit '75872d77d215d64b8d9430df23c6c74ff921227b':
lavc: Document AV_PKT_DATA_NEW_EXTRADATA
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:55:39 +02:00
Clément Bœsch
84ecbbfb27
Merge commit 'f1a9eee41c4b5ea35db9ff0088ce4e6f1e187f2c'
...
* commit 'f1a9eee41c4b5ea35db9ff0088ce4e6f1e187f2c':
x86: Add missing movsxd for the int stride parameter
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:52:23 +02:00
Clément Bœsch
1ad3ffadd9
Merge commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42'
...
* commit 'a2ddfadc2d9e91cf70aa7430a7340b418bdb5b42':
avdevice: Ignore timefilter test program
This commit is a noop, /timefilter entry was added in the original merge
(5d48e4eafa )
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:49:32 +02:00
Clément Bœsch
3536493082
Merge commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab'
...
* commit 'd6c2c2796d8885e99fc90793cdd7937826f82fab':
LICENSE: Fix silly typo
This commit is a noop, the typo disappeared when the whole paragraph was
reworked in 484aec4da3 .
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:48:24 +02:00
Clément Bœsch
a7ce5b25c0
Merge commit '84b2d3fb68caf71cff4b80b44ff865d7ae2531ce'
...
* commit '84b2d3fb68caf71cff4b80b44ff865d7ae2531ce':
h264: Drop unused function check_opcodes()
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:45:12 +02:00
Clément Bœsch
415072605b
Merge commit '05a4bacbf7ece618553d339afe1d0b57bc87aea8'
...
* commit '05a4bacbf7ece618553d339afe1d0b57bc87aea8':
avpacket: Error out when creating 0-sized side data
This commit is a noop, see 5a633ec2dd
AV_PKT_DATA_METADATA_UPDATE can be zero sized in order to clear old
meta.
Note: maybe we could add a start or end marker.
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:43:46 +02:00
Clément Bœsch
1cfa350429
Merge commit 'bcc07e2576cb723007bea1238afd019ae2d1b005'
...
* commit 'bcc07e2576cb723007bea1238afd019ae2d1b005':
pixdesc: Use C99 array to list color properties names
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:21:01 +02:00
Clément Bœsch
b4abf0e396
Merge commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703'
...
* commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703':
h264: Fix decoding delay for Intra only streams
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:06:11 +02:00
Clément Bœsch
775389fc59
Merge commit '90f469aa2b98a868cdbe35170c24272de10e1341'
...
* commit '90f469aa2b98a868cdbe35170c24272de10e1341':
lavc: add H.264 MVC profiles
Merged-by: Clément Bœsch <u@pkh.me >
2016-07-09 14:01:28 +02:00
Clément Bœsch
f512e4a390
Merge commit '61f168ae348f94f39e7afc6971654455a5de0e4d'
...
* commit '61f168ae348f94f39e7afc6971654455a5de0e4d':
h264: factor out setting the parameter sets for a frame
Michael's changes on top of the merge undo parts of the original diff
that are not factorization:
"The call point is left where it was before. Such a change should be in
a separate commit and has multiple issues, one being null pointer
dereferences the other is that some safety checks would become
conditional.
I tried to split the PPS init between the new and old functions
similarly to the SPS code."
Merged-by: Clément Bœsch <u@pkh.me >
Merged-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-09 13:57:43 +02:00
Matthieu Bouron
0f2654c9a3
lavc: add mediacodec hwaccel support
2016-07-08 17:02:37 +02:00
Hendrik Leppkes
83a940e7fb
h2645_parse: don't overread AnnexB NALs within an avc stream
...
We know the maximum size of an AnnexB NAL, signaling it as the maximum
NAL size allows ff_h2645_extract_rbsp to determine the correct size.
2016-07-08 15:20:20 +02:00
Hendrik Leppkes
c3e9b098e1
h2645_parse: only read avc length code at the correct position
...
Reading it from any other position would result in a wrong size being
read, instead fallback to the re-sync mechanic in the else clause.
2016-07-08 15:20:16 +02:00
Michael Niedermayer
b450b82514
avcodec/exr: Fix mixed declarations and statements
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-07 14:53:01 +02:00
Martin Vignali
50747d6b1f
libavcodec/exr : indent gray support patch
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-06 23:53:28 +02:00
Martin Vignali
7ebd13fc8b
libavodec/exr : add support for Y and YA file (ticket #5621 )
...
a gray channel in exr, is named Y
we admit that the file need to be interpreted as gray
only if no other channel match (except alpha)
to manage RGB and Y in the color conversion part of decode_block,
the color processing is now made with a for loop.
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-06 23:52:49 +02:00
Burt P
ba69a81019
libavfilter/af_hdcd.c: Collect HDCD stats and report
...
The new HDCD filter really does nothing to show that it is working or
that HDCD control information was even detected in the stream. This
patch collects information about the decode, like which features were
used, and reports it to the user at the end.
Also,
* Fixes low-level gain adjustment
* Updates the documentation
Signed-off-by: Burt P <pburt0@gmail.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-06 22:54:47 +02:00
Carl Eugen Hoyos
3e4357eb82
lavc/libx265: Support gray encoding.
...
Gray encoding crashes with libx265 <= 84, so check the library version.
2016-07-06 18:56:19 +02:00
Matthieu Bouron
88d9c30cf5
lavc/mediacodecdec_h264: properly convert extradata to annex-b
...
H264ParamSets has its SPS/PPS stored raw (SODB) and needs to be
converted to NAL units before sending them to MediaCodec.
This patch adds the missing convertion of the SPS/PPS from SOBP to RBSP
which makes the resulting NAL units correct.
Fixes codec initialization on Nexus 4 and Nexus 7.
2016-07-06 15:10:16 +02:00
Michael Niedermayer
55ef890b29
avcodec/iff: Print error for cols/bpp/bytes being bad in decode_delta_j()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-06 11:20:41 +02:00
Michael Niedermayer
fcdbbbd85a
avcodec/iff: decode_delta_j: Check that the number of bytes that will be read are available
...
This should avoid long loops
related to CID1361958
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-06 11:19:41 +02:00
Petru Rares Sincraian
3f5b7a2d73
fate: add test for asetrate
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-06 01:20:21 +02:00
Carl Eugen Hoyos
420ba222c6
lavc/mjpeg_parser: Allow jpegls parsing.
...
Fixes ticket #5691 .
2016-07-05 23:48:22 +02:00
James Almer
645489cf90
x86/dcadsp: optimize lfe_fir0_float_fma3 on x86_32
...
About 10% faster.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-05 17:48:20 -03:00
smitbose
d915b6e592
Added Quadrox format
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-05 02:31:35 +02:00
Martin Vignali
ce466d0a15
fate/apng : add test for apng decoding
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-05 01:48:00 +02:00
Martin Vignali
9cc114fa54
fate/png : add test for rgba64 and interleaved rgb
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-05 01:48:00 +02:00
Paul B Mahol
de30863fff
avfilter/vf_rotate: add >8 bit depth support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-07-04 20:39:16 +02:00
Hendrik Leppkes
1ad4471526
configure: disable the new optimizer in Visual Studio 2015 Update 3
...
Visual Studio 2015 Update 3 introduced a new SSA optimizer, however
it unfortunately causes miscompilations. Until it is fixed, the new
optimizations are disabled and should be re-checked on subsequent
compiler releases.
Fixes recent FATE failure of fate-lavf-pam on VS2015.
2016-07-03 23:37:44 +02:00
James Almer
293484fa5e
avcodec: add missing xmm/neon clobber test wrappers for the new decode API
...
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-07-03 18:04:30 -03:00
Clément Bœsch
64c619369b
lavc/h264_slice: use sps directly when checking for invalid 8x8 inference
2016-07-03 15:11:40 +02:00
Carl Eugen Hoyos
d5edb6c048
lavf/aiffdec: Support QDMC demuxing.
2016-07-03 04:37:48 +02:00
Michael Graczyk
37941878f1
libopusenc: Add channel mapping family argument
...
The default value of -1 indicates that ffmpeg should determine the channel
mapping automatically, which was the behavior before this commit.
Unless the -mapping_family argument is provided, behavior is unchanged.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-02 23:31:16 +02:00
Michael Graczyk
a1e3c7cf0f
libopusenc: Refactor to simplify forthcoming mapping_family parameter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-02 23:31:10 +02:00
Michael Niedermayer
fb6b6b5166
tests/checkasm/pixblockdsp: Test 8 byte aligned positions
...
The code is documented as to require 8byte alignment
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-02 22:21:53 +02:00
Michael Niedermayer
07f5e75a47
tests/fate: Add test for ticket 3386 ([H264] [Regression] illegal short term buffer state detected)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-02 21:37:48 +02:00
Michael Niedermayer
febc862b53
avcodec/h264_parser: Set sps/pps_ref
...
Fixes use of freed memory
Should fix valgrind failures of fate-h264-skip-nointra
Found-by: logan
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-02 03:07:23 +02:00
James Almer
77eb05a2f1
avcodec/h264_slice: Only call ff_h264_flush_change() on initialized contexts
...
Changed by committer to ensure context_initialized is reset
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-01 21:39:09 +02:00
Martin Vignali
92bf87db29
fate/webp : add test for lossless picture to improve cover
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-01 20:58:51 +02:00
Clément Bœsch
5565e27111
Merge commit '6e92181bf836f48627a4733b6fd240a99fd36365'
...
* commit '6e92181bf836f48627a4733b6fd240a99fd36365':
h264: pass just the PPS to get_chroma_qp()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-07-01 14:23:38 +02:00
Clément Bœsch
2021326f99
Merge commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf'
...
* commit 'd1f539c97e04e7cebecaf6916c5064f243d39fcf':
h264: merge the two reinit blocks in slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-07-01 14:19:09 +02:00
Clément Bœsch
99b37f53a1
Merge commit '3fba16ecd978d5bed338b8da643c3435e62b3437'
...
* commit '3fba16ecd978d5bed338b8da643c3435e62b3437':
h264: factor starting a new field out of parsing the slice header
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-07-01 14:02:00 +02:00
Michael Niedermayer
2a8dadb38f
doc/APIchanges: fill in missing git hash
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-01 02:42:03 +02:00
Michael Niedermayer
86fec7a7e8
doc/APIchanges: document the lavu/lavf field moves
...
Based-on: patch by James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-07-01 02:11:47 +02:00
Michael Niedermayer
c1c7e0abb0
avformat/avformat: Move new field to the end of AVStream
...
This fixes part of Ticket5676
This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1
This is a similar ABI fix to 1eb43af1a0
Approved-by: BBB
Approved-by: jamrial
Approved-by: BtbN
Approved-by: nevcairiel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-30 17:43:01 +02:00
Hendrik Leppkes
c2e13d2ecd
avformat/utils: update deprecated AVStream->codec when the context is updated
...
This ensures the AVStream->codec entry is kept in sync when new streams are
discovered mid-playback or changes to the context occur from other sources.
Fixes trac 5678.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-30 17:43:01 +02:00
Michael Niedermayer
042fb69deb
avutil/frame: Move new field to the end of AVFrame
...
This fixes part of Ticket5676
This fixes kodi, mpv, chromium and ffplay build against 3.0 and linked to 3.1
This is a similar ABI fix to 1eb43af1a0
Approved-by: BBB
Approved-by: jamrial
Approved-by: BtbN
Approved-by: nevcairiel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-30 17:43:01 +02:00
Martin Vignali
d9e1e08133
libavcodec/exr : fix decoding piz float file.
...
fix ticket #5674
the size of data to process in piz_uncompress, is now calc
using the pixel type of each channel.
the data reorganization, alos take care about the size of
each channel
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-30 12:16:52 +02:00
Dan Parrot
1df908f33f
PPC64: Add versions of functions in libswscale/input.c optimized for POWER8 VSX SIMD.
...
This patch addresses Trac ticket #5570 . The optimized functions are in file
libswscale/ppc/input_vsx.c. Each optimized function name is a concatenation of the
corresponding name in libswscale/input.c with suffix _vsx.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-30 12:02:08 +02:00
Vadim Kalinsky
e370aad67d
avformat/mov: Skip non-key frames if AVDISCARD_NONKEY is set.
...
Github: Closes #222
2016-06-30 12:00:13 +02:00
Clément Bœsch
f48aea66dd
Merge commit 'bec993381cfec72051b0d9f12ac9d9bb9c750983'
...
* commit 'bec993381cfec72051b0d9f12ac9d9bb9c750983':
h264: postpone generating the implicit MMCOs
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-30 10:24:03 +02:00
Clément Bœsch
d407e76c42
Merge commit '2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85'
...
* commit '2d410ebbaa1e760d6837cb434a6d1d4c3c6f0d85':
h264: decode the MMCOs into per-slice contexts
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-30 10:15:51 +02:00
Benoit Fouet
879330c561
h264: make H264ParamSets sps const
2016-06-30 09:24:39 +02:00
Benoit Fouet
4cc1ce4a91
h264: straighten dimensions check ff_h264_decode_seq_parameter_set
...
The MBS only flag was not taken into account when checking macroblock dimensions.
Also removes the unneeded check in init_dimensions for slices.
2016-06-30 09:24:39 +02:00
Benoit Fouet
3e8cda1eb1
h264_ps: change decode_scaling_matrices so that it takes const {s,p}ps
...
In order to be able to make SPS const in H264ParamSets,
modify decode_scaling_matrices so that it returns if the scaling
matrix are present in the SPS, instead of altering the input SPS
structure.
2016-06-30 09:24:39 +02:00
Clément Bœsch
57d30fde9e
Merge commit '39ab2ea53121b9976a619cd545fbd3464b908696'
...
* commit '39ab2ea53121b9976a619cd545fbd3464b908696':
h264: rename mmco_index to nb_mmco
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-29 20:07:52 +02:00
Clément Bœsch
c28aecc56a
Merge commit '7ab5d577a9affe3397c08b032f983f9bf7101865'
...
* commit '7ab5d577a9affe3397c08b032f983f9bf7101865':
h264: move initializing the slice start out of h264_slice_header_parse()
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-29 20:04:23 +02:00
Petru Rares Sincraian
2b1995e3ee
fate: add test for asetnsamples
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-29 19:32:37 +02:00
Timo Rothenpieler
1a75145559
lavfi: Move new field to the end of AVFilterContext
...
This fixes an accidental ABI break introduced at 8688d3a .
2016-06-29 18:23:28 +02:00
Clément Bœsch
4890b0851c
Merge commit '4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960'
...
* commit '4cec43a9eeb58eb9e581a2d9d25f78e5bfbb0960':
h264: move calculating the POC out of h264_slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 17:59:57 +02:00
Clément Bœsch
9ab6f01839
Merge commit '6dd996c7c81575a1e4969987ab175a6df7beab3d'
...
* commit '6dd996c7c81575a1e4969987ab175a6df7beab3d':
h264: move building the reference list out of h264_slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 17:42:06 +02:00
Clément Bœsch
3b95452ca8
Merge commit '0bad254300356005af4aef00a706bf2e8eee96bc'
...
* commit '0bad254300356005af4aef00a706bf2e8eee96bc':
h264: move initing the implicit pred weight table out of h264_slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 17:39:33 +02:00
Clément Bœsch
2aff557c6a
Merge commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c' into merge-libav-new
...
* commit 'ed9a20ebe4a89de119ea97bdccf688ece8c6648c':
h264: split reading the ref list modifications and actually building the ref list
ref_modifications.val are read as u32 instead of u8 in FFmpeg.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 17:32:05 +02:00
Michael Niedermayer
89cccfc905
fate/h264: add test for skip-nointra and skip-nokey
2016-06-29 16:22:37 +02:00
Clément Bœsch
a2901472fe
lavc/h264_slice: properly forward positive "error" code
...
Fixes ./ffmpeg -skip_frame nokey -i h264/h264_intra_first-small.ts
Regression since c54e2740e1
2016-06-29 16:16:26 +02:00
Clément Bœsch
cdecb39fca
Merge commit 'fa57059079190242517701120cfdccad93c866da'
...
* commit 'fa57059079190242517701120cfdccad93c866da':
h264: move initialising the implicit pred weight table for MBAFF
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 15:29:38 +02:00
Clément Bœsch
527a579327
Merge commit '7b50d60442af8d9527e9da46818011fe15a5265a'
...
* commit '7b50d60442af8d9527e9da46818011fe15a5265a':
h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 15:17:16 +02:00
Clément Bœsch
d7a2451688
Merge commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4'
...
* commit 'b16e9b9ac9db449cae2242767dd3c3fc309357c4':
h264: move initialising the explicit pred weight table for MBAFF
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 15:03:12 +02:00
Clément Bœsch
7f607120d9
Merge commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6'
...
* commit 'b93c0aed79f7f942e0dec26e53c147f297ce2ff6':
h264: drop an outdated comment
This commit is a noop, see 237d31e0b9
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 15:00:01 +02:00
Clément Bœsch
3c5a3882f9
Merge commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e'
...
* commit '77a1e2c5f8f8250dfacff24b993eb473260ed13e':
h264: move direct mode inits out of h264_slice_header_parse()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 14:58:31 +02:00
Clément Bœsch
c54e2740e1
Merge commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74'
...
* commit 'd06e4d8aab9c679b6aea2591d2a9b382df9e5f74':
h264: start splitting decode_slice_header()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 14:55:02 +02:00
Michael Niedermayer
0c50f6905f
avcodec/h264: Remove au_pps_id
...
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-29 14:49:15 +02:00
Michael Niedermayer
e6e8750e94
avcodec/h264: Remove current_sps_id
...
This should not be needed anymore and simplifies the next merge
Requested-by: Clément Bœsch <u@pkh.me >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-29 14:49:15 +02:00
Timo Rothenpieler
1eb43af1a0
lavfi: Move new field to the end of AVFilterLink
...
Even though this is not part of the public API, some external
applications access fields after it, thus breaking after updating from
ffmpeg 3.0 or earlier.
Since it is not public, it can be freely moved to the end to avoid
that problem in the future.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-29 12:53:07 +02:00
Timo Rothenpieler
1bd9fb6de5
ffplay: Fix usage of private lavfi API
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-29 12:53:01 +02:00
Clément Bœsch
6c841e03ce
Merge commit '2940e196c5e439d9869f8c02a49a318d0847453c'
...
* commit '2940e196c5e439d9869f8c02a49a318d0847453c':
vaapi_h265: cu_qp_delta should not be used in constant-QP mode
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 12:03:47 +02:00
Clément Bœsch
4b90413cb2
Merge commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8'
...
* commit '02fa1ad9266f9b1ea11565ac2f93f45853e351e8':
vaapi_h264: Add source version identifier as unregistered SEI
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 12:03:40 +02:00
Clément Bœsch
cc3de390b7
Merge commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8'
...
* commit '48e2967cd50c2e1a2a539fd697d20ead2c5c4cc8':
vaapi_h264: Add support for SEI messages
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 12:03:28 +02:00
Clément Bœsch
19fe328f12
Merge commit '19d7667a81499d4357ec8e0851701e17c238e584'
...
* commit '19d7667a81499d4357ec8e0851701e17c238e584':
vaapi_encode: Add support for writing arbitrary additional packed headers
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 12:03:20 +02:00
Clément Bœsch
3e71e34333
Merge commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0'
...
* commit '081961f819c0b16c7a860d7da7d39f1fd91bd2f0':
vaapi_h264: Add support for VUI parameters
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 12:03:06 +02:00
Clément Bœsch
fc0eafb7f8
Merge commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072'
...
* commit '2e4a7bd553ec7c805b4a3b90733405a14ba69072':
h264: drop unused H264Context.gb
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:56:57 +02:00
Clément Bœsch
bef74ef367
Merge commit '4f81f8dba735c212efae077c4fec8ad4fe53b352'
...
* commit '4f81f8dba735c212efae077c4fec8ad4fe53b352':
Drop unnecessary golomb.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:54:54 +02:00
Clément Bœsch
4b9574b275
Merge commit '197ae68e78784524a7ccf97a3c301092715305d3'
...
* commit '197ae68e78784524a7ccf97a3c301092715305d3':
Drop unnecessary unary.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:52:34 +02:00
Clément Bœsch
bf7d016219
Merge commit '6ac52f05a6fcadb84972c9557b28c67a416f866b'
...
* commit '6ac52f05a6fcadb84972c9557b28c67a416f866b':
dvbsub_parser: Add missing mem.h #include
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:52:03 +02:00
Clément Bœsch
daedfa7254
Merge commit '81f769fa129edc51c28285649c2df6da717e718f'
...
* commit '81f769fa129edc51c28285649c2df6da717e718f':
gsm: Move requant_tab table to the gsm tables file
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:48:53 +02:00
Clément Bœsch
0501305e38
Merge commit '42dc214323637464759354912e18b2bee1884dd1'
...
* commit '42dc214323637464759354912e18b2bee1884dd1':
mpc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:46:36 +02:00
Clément Bœsch
c7253353f8
Merge commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e'
...
* commit '85b8403c6fd11e1c570caa970c7f435ac5f9583e':
svq1enc: Drop unused GetBitContext context member
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:45:37 +02:00
Clément Bœsch
f8beca6f10
Merge commit '6d8fd614ff957af242efcd8a6a0619874382f3a4'
...
* commit '6d8fd614ff957af242efcd8a6a0619874382f3a4':
vorbis: Kill some pointless debug code
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:43:57 +02:00
Clément Bœsch
9afa64dfdf
Merge commit '59c6509d9f0236acbc317198eab76dab8320bced'
...
* commit '59c6509d9f0236acbc317198eab76dab8320bced':
mss2: Drop a silly assert
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:42:42 +02:00
Clément Bœsch
f755aa5ebd
lavc: move 2 more BITSTREAM_READER_LE definitions
...
This was mentioned to be in ae753dbd0d but
actually wasn't.
2016-06-29 11:41:12 +02:00
Clément Bœsch
ae753dbd0d
Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'
...
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes
The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:35:10 +02:00
Clément Bœsch
543142990b
Merge commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4'
...
* commit '09c4e5c5988c0037d108c5fc2a137d9ad488f7f4':
indeo2: Drop disabled big-endian ir2_codes table
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:20:20 +02:00
Clément Bœsch
9b35242370
Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'
...
* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
Remove unnecessary get_bits.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:16:01 +02:00
Clément Bœsch
1994a73a6b
Merge commit '2a48a75a6f508121b96b0732a9fe03a46303f579'
...
* commit '2a48a75a6f508121b96b0732a9fe03a46303f579':
sgirledec: simplify, no need to use reget buffer
This commit is a noop, see ccc3f4e710
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:09:36 +02:00
Clément Bœsch
ee7d01e81a
Merge commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d'
...
* commit '6e2ad28cf76461b02d85ad178087ba0c628b8d9d':
aic: add frame threading support
This commit is a noop, see 8e069eb525
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:07:41 +02:00
Clément Bœsch
dd1b1e3223
Merge commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9'
...
* commit 'c3ed259e4fef64a1af4f6537be545fba47491aa9':
fate: Move Canopus decoder tests to a separate file
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-29 11:05:49 +02:00
Matthieu Bouron
db0af7250a
lavc/mediacodecdec_h264: add missing NAL headers to SPS/PPS buffers
...
Fixes a regression introduced by 0cd5e281df .
2016-06-29 10:46:29 +02:00
Michael Niedermayer
8a3221cc67
avformat/mov: Check sample size
...
Fixes integer overflow
Fixes: poc.mp4
Found-by: ajax secure <ajax4sec@hotmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-29 00:30:55 +02:00
Martin Vignali
2bdb26b4ee
fate/webp : add test for lossy compression.
...
the result of ffmpeg decoding is binary exact with the yuv output of
official decoder (dwebp)
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-28 18:21:12 -03:00
Michael Niedermayer
c0cb53cd1f
avdevice/decklink_common: Replace rare spelling of Succesfully by 500 times more common one
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-28 03:07:54 +02:00
Michael Niedermayer
6cc4c42226
avcodec/ccaption_dec: Fix mixed declaration and statement.
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-28 02:33:03 +02:00
Aman Gupta
4448f16ef5
avcodec/ccaption_dec: implement tab offset commands
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-28 01:52:31 +02:00
Michael Niedermayer
0a72b69889
MAINTAINERS: remove 2.4 as 3.1 was released
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-27 22:51:39 +02:00
Clément Bœsch
8b4d6cc809
Merge commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54'
...
* commit '20a8c78ce0a5baf37f6a94e2d1e57e186b6f4b54':
avconv: Do not copy extradata if source buffer is empty
This commit is a noop, see 4d02dfbde4
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-27 20:10:35 +02:00
Clément Bœsch
e6d0acd438
Merge commit '38f99017e69bd25e88be87117237c29727c25635'
...
* commit '38f99017e69bd25e88be87117237c29727c25635':
vp9: Return the correct size when decoding a superframe
This commit is a noop, see c2f3715cb3
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-27 19:54:37 +02:00
Clément Bœsch
85a52a77ce
Merge commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5'
...
* commit 'b2d5d6a7f20a255a5f3c9bf539cc507afd909ce5':
build: Only enable symbol reduction if the compiler does proper DCE
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-27 19:48:21 +02:00
Clément Bœsch
da7c918e80
Merge commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1'
...
* commit 'c5fd4b50610f62cbb3baa4f4108139363128dea1':
build: Simplify postprocessing of linker version script files
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-27 19:39:46 +02:00
Clément Bœsch
c5566f0a94
lavc/pnm_parser: disable parsing for text based PNMs
...
P1, P2, and P3 are respectively the text versions of PBM, PGM and PPM
files.
We can not obtain the buffer size using av_imgage_get_buffer_size() as
every pixel in the picture will occupy a random size between 16 and 32
bits ("4 " and "231 " are such example).
Ideally, we could look for the next header (or EOF) in the bytestream,
but this commit is meant to fix a decoding regression introduced by
48ac4532d4 .
Fix Ticket #5670
2016-06-27 18:04:50 +02:00
Matthieu Bouron
0acc170aad
Merge commit '535a742c2695a9e0c586b50d7fa76e318232ff24'
...
* commit '535a742c2695a9e0c586b50d7fa76e318232ff24':
build: Change structure of the linker version script templates
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-27 17:56:47 +02:00
Rick Kern
d956171813
Changelog: Add VideoToolbox encoder entry for 3.1
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-27 11:43:13 -04:00
Matthieu Bouron
0fd76d77d6
Merge commit '5b1b495c8d21600eac694d50f428654a3125e217'
...
* commit '5b1b495c8d21600eac694d50f428654a3125e217':
build: Print a message when generating version scripts
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-27 17:35:04 +02:00
Matthieu Bouron
9eb3da2f99
asm: FF_-prefix internal macros used in inline assembly
...
See merge commit '39d6d3618d48625decaff7d9bdbb45b44ef2a805'.
2016-06-27 17:21:18 +02:00
Matthieu Bouron
39d6d3618d
Merge commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e'
...
* commit '1e9c5bf4c136fe9e010cc8a7e7270bba0d1bf45e':
asm: FF_-prefix internal macros used in inline assembly
This commit is a noop as the ASM codebase differs too much between libav
and ffmpeg. The corresponding chunks will be found in the next commit.
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-27 17:18:25 +02:00
Paul B Mahol
d693392886
avformat/mov: parse rtmd track timecode
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-27 10:27:25 +02:00
Marton Balint
b18d6c5800
avdevice/decklink: fix mingw portability
...
Fixes ticket #5669 .
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-27 02:12:07 +02:00
Rick Kern
729d82abae
configure: use c++98 for c++ files
...
Use c++98 standard instead of c++11.
Signed-off-by: Rick Kern <kernrj@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 23:25:23 +02:00
Martin Vignali
bd2cec7021
fate/webp : add test for webp lossless decoding (rgb and rgba)
...
output have been compared with official decoding tool output (dwebp)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 21:12:33 +02:00
Martin Vignali
971ee09d32
fate/exr : add tests for file with half and float channels
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 21:12:32 +02:00
James Almer
c6f2d1a21f
changelog: fix entry order
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-26 15:27:47 -03:00
James Almer
069fd69662
Update FFmpeg 3.1 cut marker
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-26 14:45:54 -03:00
Marton Balint
cf0a05668b
avdevice/decklink: add support for setting input packet timestamp source
...
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:18:06 +02:00
Marton Balint
da89c6e37c
avdevice/decklink: add support for audio and video input selection
...
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:18:02 +02:00
Marton Balint
8f9fa49bd8
avdevice/decklink: add support for setting duplex mode
...
This patch also makes BlackMagic drivers v10.6.1 a hard requirement.
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:17:56 +02:00
Marton Balint
e22760aafd
avdevice/decklink: always free decklink resources on error
...
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:17:52 +02:00
Marton Balint
38d75fe906
avdevice/decklink: factorize device finder function
...
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:17:45 +02:00
Marton Balint
4ce0a77ec8
avdevice/decklink: remove unused itermode iterators
...
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:17:40 +02:00
Marton Balint
1fc85d8511
avdevice/decklink: factorize cleanup function to common code
...
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:17:37 +02:00
Marton Balint
340cea9f22
avdevice/decklink_dec: fix bitrate calculations
...
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-26 19:17:29 +02:00
Michael Niedermayer
e9394ca63d
avcodec/libopenjpegenc: Set numresolutions by default to a value that is not too large
...
Fixes issues with libopenjpeg 2.1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 18:08:04 +02:00
Hendrik Leppkes
c142dc203e
Merge commit 'dc40a70c5755bccfb1a1349639943e1f408bea50'
...
* commit 'dc40a70c5755bccfb1a1349639943e1f408bea50':
Drop unnecessary libavutil/x86/asm.h #includes
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:53:00 +02:00
Hendrik Leppkes
5e418fd63a
Merge commit '5264e7ba217b3c0ceae813917134e1ab52573141'
...
* commit '5264e7ba217b3c0ceae813917134e1ab52573141':
ac3: Check the array bound before dereferencing
See d85ebea3f3
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:47:05 +02:00
Hendrik Leppkes
f2a3798ea4
Merge commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84'
...
* commit 'a86aa16088ad7f22a8918d71adb8c040d6033d84':
vaapi_h264: Add trivial support for low-power encoding
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:44:43 +02:00
Hendrik Leppkes
d3327b7eda
Merge commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b'
...
* commit 'b51c7c6b8a5b35cfd06cb9655f9ec4c9f0ddd81b':
vaapi_h264: Fix frame_num after non-reference frames
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:44:35 +02:00
Hendrik Leppkes
18b1b8be6a
Merge commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32'
...
* commit '2bfa067d0b636e7b2004fb0ad5a53d0d48c6de32':
vaapi_encode: Check config attributes before creating config
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:44:25 +02:00
Hendrik Leppkes
5a9134f5f1
Merge commit '6641819feedb086ebba3d2be89b8d33980f367e1'
...
* commit '6641819feedb086ebba3d2be89b8d33980f367e1':
build: Ignore generated mapfile and remove it on distclean
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:43:05 +02:00
Hendrik Leppkes
cd52ec2337
Merge commit 'f5c43884190be094749acfba104e3eab98d8ff1e'
...
* commit 'f5c43884190be094749acfba104e3eab98d8ff1e':
FATE: drop the audio stream from the dxtory test
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:41:49 +02:00
Hendrik Leppkes
7fe7cdca36
Merge commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e'
...
* commit 'fe7b21c8f148493c6fbceb7f887a77531dd1ae0e':
avconv: fix parsing bitstream filters
Not merged because ffmpeg_opt.c still uses the old BSF API.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:39:06 +02:00
Hendrik Leppkes
c9ee36e60f
Merge commit '80fb19bc234a3f2350d891adf39f3738a8e4849f'
...
* commit '80fb19bc234a3f2350d891adf39f3738a8e4849f':
avconv: fix a check for av_bsf_get_by_name() return value
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:37:34 +02:00
Hendrik Leppkes
4e6f2dbcd3
Merge commit '9f7590f4e497c12693247d7f935a20d7773a64dd'
...
* commit '9f7590f4e497c12693247d7f935a20d7773a64dd':
avconv_vaapi: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:36:27 +02:00
Hendrik Leppkes
06a0e18435
hwcontext_dxva2: Use GetDesktopWindow instead of GetShellWindow
...
Improves compatibility with some MinGW variants,
see 771537edcf
2016-06-26 15:34:40 +02:00
Hendrik Leppkes
85da4f9258
Merge commit '18c506e9e6e8df8b1d496d093077b8240ea68c28'
...
* commit '18c506e9e6e8df8b1d496d093077b8240ea68c28':
avconv_dxva2: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:34:01 +02:00
Hendrik Leppkes
844256740d
Merge commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6'
...
* commit 'f72db3f2f3a8c83a4f5dede8fa03434b2bf676c6':
avconv_vdpau: use the hwcontext device creation API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:29:39 +02:00
Hendrik Leppkes
ed5d03ff6f
Merge commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa'
...
* commit 'b8bf9194af602cf3a4bcd19a5e278e3d6d69f8fa':
hwcontext_vaapi: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:25:38 +02:00
Hendrik Leppkes
162370b473
Merge commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded'
...
* commit '8e70385a8ed06f96f1e9e35cf7b6788a5c56eded':
hwcontext_dxva2: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:25:24 +02:00
Hendrik Leppkes
c5a0c16850
Merge commit '2e219b491bcc0845248345fdad31231b081e06d1'
...
* commit '2e219b491bcc0845248345fdad31231b081e06d1':
hwcontext_cuda: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:25:12 +02:00
Hendrik Leppkes
613ac3bf82
Merge commit '38392b2af815898b8716826c4e29d95c04fb2647'
...
* commit '38392b2af815898b8716826c4e29d95c04fb2647':
hwcontext_vdpau: implement device creation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:24:53 +02:00
Hendrik Leppkes
481f320aa3
Merge commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d'
...
* commit '1c9e8616c535ef496e7ee8a5cbc5e9e972a6977d':
hwcontext: add a function for opening devices
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:23:24 +02:00
Hendrik Leppkes
2c1d0f871f
Merge commit '24b5cff01bbac4e08acfd6d19c499e880988f520'
...
* commit '24b5cff01bbac4e08acfd6d19c499e880988f520':
lavc: handle hw_frames_ctx where necessary
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:20:43 +02:00
Hendrik Leppkes
b20fe650ef
Merge commit '4024b566d664a4b161d677554be52f32e7ad4236'
...
* commit '4024b566d664a4b161d677554be52f32e7ad4236':
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:12:48 +02:00
Hendrik Leppkes
324f0fbff1
Merge commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00'
...
* commit '7ca4fdc046a945949866bb6fc550e3cab1fc8c00':
fate: More fine-grained dependencies for demuxer tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 15:06:47 +02:00
Hendrik Leppkes
093e06f2d6
Merge commit '07377fb557909015338b4c215b87b9c73ea577ad'
...
* commit '07377fb557909015338b4c215b87b9c73ea577ad':
fate: More fine-grained dependencies for voice codec tests
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:58:58 +02:00
Hendrik Leppkes
f972653ec1
Merge commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b'
...
* commit '3fdffc032e8ea5676bc0c2551b900c0dc887835b':
rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:51:33 +02:00
Hendrik Leppkes
b95534bb67
Merge commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298'
...
* commit 'e47b8bbf0b54599d44b9330eb4d68cdde4f6d298':
avcodec: Bump micro version after changing public JPEG 2000 defines
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:49:10 +02:00
Hendrik Leppkes
46ff31d39c
Merge commit 'ad61da054bd8c74a5d5b38d80846228fc6147108'
...
* commit 'ad61da054bd8c74a5d5b38d80846228fc6147108':
jpeg2000: Fix profile define values
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:41:05 +02:00
Hendrik Leppkes
7c6ae9ca04
Merge commit 'ac84e618df4765ba751327497994066d0931e6a8'
...
* commit 'ac84e618df4765ba751327497994066d0931e6a8':
avfiltergraph: check the query_formats() return value
This commit is a noop, see 6a4c5c730e
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:40:19 +02:00
Hendrik Leppkes
f9a186c59b
Merge commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e'
...
* commit '2ef6dab0a79a9852a92ed80b07f9e32a37530d9e':
lavc: document that avcodec_close() should not be used
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:35:10 +02:00
Hendrik Leppkes
69c38d64d7
Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
...
* commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
lavc: deprecate avcodec_get_context_defaults3()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:34:53 +02:00
Hendrik Leppkes
6988cf2969
Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'
...
* commit '5f30ac27795f9f98043e8582ccaad8813104adc4':
lavc: deprecate avcodec_copy_context()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:34:02 +02:00
Hendrik Leppkes
97bdb94341
Merge commit '14634429b915333f3612eaf41db3954222dc4aaf'
...
* commit '14634429b915333f3612eaf41db3954222dc4aaf':
lavf: update muxing doxy
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:32:38 +02:00
Hendrik Leppkes
314e608631
Merge commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3'
...
* commit '74b1bf632f125a795e66e5fd0a060b9c7c55b7a3':
mp3: Make the extrasize explicit
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:31:53 +02:00
Hendrik Leppkes
e2836397f1
Merge commit '52567e8198669a1e7493c75771613f87a90466c3'
...
* commit '52567e8198669a1e7493c75771613f87a90466c3':
get_bits: Drop some TRACE-level debug code
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:19:48 +02:00
Hendrik Leppkes
b23d4e52fd
Merge commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5'
...
* commit 'e45a638f50cc1dbeb87b9792e68f57e77fc0c3b5':
dump: Drop unused variable
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:13:36 +02:00
Hendrik Leppkes
4531981a9b
Merge commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8'
...
* commit 'e2a3df1a464091075040a81ffc419fa21a8a5fd8':
avconv: Use more precise deprecation ifdefs
The PSNR functionality is not deprecated in ffmpeg.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:08:51 +02:00
Hendrik Leppkes
b8945c4e2a
Merge commit '35c858066840352d6d43385bbc728467c5150974'
...
* commit '35c858066840352d6d43385bbc728467c5150974':
avconv: stop using AVStream.codec
Not merged, as ffmpeg.c is not migrated to codecpar yet, and this commit
only changes minor parts of AVStream.codec usage, which should get applied
after ffmpeg.c is using codecpar.
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-26 14:05:57 +02:00
Paul B Mahol
8fb92ea7e2
avcodec: add YUY2 Lossless Codec decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-26 10:18:10 +02:00
Michael Niedermayer
074fdf4d12
doc/APIchanges: Add FFmpeg 3.1 cut marker
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 03:13:17 +02:00
Michael Niedermayer
7b92fe8d3f
doc/APIchanges: Fill in and correct more stuff
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 02:59:23 +02:00
Michael Niedermayer
8baa1d2209
avfilter/vf_paletteuse: enable skip_initial_unpaired
...
Fixes crash due to unprocessed input being passed through
This fixes the last segfault caused by mixing 3.0 and 3.1 libs and
applications
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 01:08:28 +02:00
Michael Niedermayer
f1dabc958e
avfilter/dualinput: Add support to skip initial unpaired frames
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 01:01:28 +02:00
Michael Niedermayer
9981b70da5
avcodec/h264_sei: Do not skip subsequent SEIs on errors potentially caused by missing parameter sets.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 00:44:47 +02:00
Michael Niedermayer
fdd8aac7e1
avfilter/src_movie: Add option to remove timestamp discontinuities
...
This can also be extended to remove discontiuities caused by seek commands
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-26 00:20:00 +02:00
Jan Sebechlebsky
d46a8e30dc
avformat/tee: Support arbitrary number of slaves
...
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
2016-06-25 23:34:26 +02:00
Timo Rothenpieler
888a5c7947
avcodec/nvenc: Bring encoder names in line with other encoders
2016-06-25 23:05:17 +02:00
Rodger Combs
6ee7adb881
lavf/srtdec: fix indent
2016-06-25 15:53:11 -05:00
Rodger Combs
af7e2734b9
lavf: update auto-bsf to new BSF API
2016-06-25 15:50:04 -05:00
Rodger Combs
150e5e13b1
lavf: deprecate av_apply_bitstream_filters
2016-06-25 15:50:03 -05:00
Rodger Combs
1df401505c
lavf/srtdec: fix probing files with negative first timestamps
2016-06-25 15:50:03 -05:00
Martin Storsjö
a590d344e3
omx: Don't return > 0 from omx_encode_frame
...
The encode function is supposed to just return 0 on success.
This stems from a mixup with the return value of decode functions.
Reviewed-by: Jan Gerber <j@v2v.cc >
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-25 21:39:17 +02:00
Michael Niedermayer
4cc896ea5f
avformat/format: Fix registering a format more than once and related races
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-25 20:09:10 +02:00
Clément Bœsch
a887fbb582
lavfi/subtitles: remove unecessary checks
2016-06-25 19:14:21 +02:00
Clément Bœsch
e73ccfd6ad
lavfi/subtitles: fix memleak after 6bcb1e1a
...
Spotted-by: James Almer <jamrial@gmail.com >
2016-06-25 19:12:03 +02:00
Aman Gupta
ee2a8f142b
avcodec/omx: fix deprecation warning for ff_alloc_packet
...
Tested-by: Jan Gerber <j@v2v.cc >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-25 18:48:59 +02:00
Martin Vignali
d96b8144c0
avcodec/exr: add missed hunks from previous exr commit
2016-06-25 18:28:06 +02:00
Martin Vignali
1e38791b7f
avcodec/exr: fix reading float channel when there is half and float channels in a file
2016-06-25 18:10:10 +02:00
Clément Bœsch
6bcb1e1aff
lavfi/subtitles: switch to codecpar
2016-06-25 16:53:35 +02:00
David Murmann
0296b4b8d8
avformat/movenc: add option to use keys/mdta atoms for metadata
...
Add -movflags use_metadata_tags to the mov muxer. This will cause
the muxer to write all metadata to the file in the keys and mtda
atoms.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-25 14:38:14 +02:00
Clément Bœsch
dfd0c0f981
lavc/neontest: fix constness in arm/aarch64 avcodec_open2() wrappers
2016-06-25 13:41:13 +02:00
Clément Bœsch
8ca78d0fef
lavf/utils: fix const warning at a find_decoder() call
2016-06-25 13:38:53 +02:00
Clément Bœsch
11ee8a4504
ffmpeg: do not use deprecated AVSubtitleRect.pict
2016-06-25 13:35:46 +02:00
Clément Bœsch
e13134c730
Merge commit '3399a26d3f57d462e839c0ee51223ae9aca20852'
...
* commit '3399a26d3f57d462e839c0ee51223ae9aca20852':
nvenc: allow setting the number of slices
nvenc: De-compensate aspect ratio compensation of DVD-like content.
nvenc: list the major contributors in the copyright header
configure: Don't require nonfree for nvenc
nvenc: drop the hard dependency on CUDA
nvenc: only support HW frames when CUDA is enabled
nvenc: write the VUI signal properties for HEVC
nvenc: only write the VUI signal type fields if they are set
nvenc: Generate bufferingPeriod/pictureTiming SEI
nvenc: Delay frame output to increase encoding speed
nvenc: add support for lossless encoding
nvenc: Generate AUD NAL units for better compatiblity
nvenc: fix the rc option definitions
All these commits are noop as requested by Timo Rothenpieler.
<BtbN> andrey_turkin, ubitux, yeah, I like the current state of nvenc in
ffmpeg, I think most remaining differences should be merged on the libav
side of things. At least I'm not aware of anything that's missing in
ffmpeg.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-25 11:58:36 +02:00
Clément Bœsch
c7babd50de
Merge commit '65dc7ca4c8e7e56362626a5d31e563e80108f104'
...
* commit '65dc7ca4c8e7e56362626a5d31e563e80108f104':
Add release notes for 12.
This commit is a noop, but we absolutely need someone to write the
release notes.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-25 11:46:08 +02:00
Clément Bœsch
2ab823d4a6
Merge commit 'd68fb1475856cf93199e2bc4eee3063902c35df7'
...
* commit 'd68fb1475856cf93199e2bc4eee3063902c35df7':
mjpegdec: Properly fail on malloc failure
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-25 11:42:57 +02:00
Clément Bœsch
63ac806ccb
Merge commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a'
...
* commit '85ce9636e42dbda06b7d0af76a528a64b113fb3a':
configure: move the hardware accel libs' entries in the configure output
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-25 11:32:26 +02:00
Clément Bœsch
7bf52e12d4
Merge commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d'
...
* commit 'c0f4c7db9fea1c07d290a298b8db858b7ceed96d':
configure: move the hardware accel libs' entries in the help text
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-25 11:23:19 +02:00
Anton Khirnov
398f015f07
avconv: buffer the packets written while the muxer is not initialized
2016-06-25 11:15:54 +02:00
Anton Khirnov
1c169782ca
avconv: explicitly postpone writing the header until all streams are initialized
...
This should have no practical effect for now, but will make a difference
in the following commits.
2016-06-25 11:12:53 +02:00
Anton Khirnov
5b63b15663
lavfi: set the link hwframes context before configuring the dst input
...
The destination filter might expect the hw frames context to be already
set (this is the case e.g. for hwdownload).
2016-06-25 11:11:46 +02:00
Clément Bœsch
680ec710ec
Merge commit '5e2203448ab4cc8ea1d933b87f1b39b009201044'
...
* commit '5e2203448ab4cc8ea1d933b87f1b39b009201044':
configure: improve the help text for external libraries
Only merged the explanation paragraphs. The removal of "enable/disable"
and "[no]" would create too much inconsistency and might cause
confusion.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-25 11:01:50 +02:00
Clément Bœsch
b45348130a
Merge commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c'
...
* commit '0d95d88fbd1aeadafb8b0b1bfb880bf21b33132c':
lavc: revert the Makefile part of 330177b
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-25 10:46:08 +02:00
Clément Bœsch
1e9b79b2db
movenc: mark astronomical_body const string as static
2016-06-25 10:30:28 +02:00
Rick Kern
8db203a9dd
lavd/decklink: Fix compile issue on OS X
...
Fixes #4124 : Invalid argument '-std=c99' not allowed with 'C++/ObjC++'
C++ files fail to compile. This adds '-std=c++11' to CXX_FLAGS to fix.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-24 21:59:43 -04:00
Jing Yu
311a953c76
avcodec/ppc: fix broken build when compiling libavcodec with LLVM on PPC backend
...
This commit fixes a broken build when compiling libavcodec with LLVM
compiler. These assembly files use non-standard format that is only
supported by GCC compiler. It would be nice to use a common standard
format. With this patch, both GCC and LLVM can build and generate the
same objects.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-25 03:48:19 +02:00
Michael Niedermayer
46a60fe184
avformat: Fix ff_interleaved_peek()
...
Fixes assertion failures in movenc
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-25 03:04:55 +02:00
Martin Storsjö
0c9c4004ed
omx: Don't return > 0 from omx_encode_frame
...
The encode function is supposed to just return 0 on success.
This stems from a mixup with the return value of decode functions.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-24 22:30:54 +03:00
Martin Storsjö
31aa5335c3
libopenh264enc: Fix inconsistent whitespace
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-24 22:30:46 +03:00
Michael Niedermayer
f573acc424
avformat/matroskadec: Call matroska_read_close() on header parsing error
...
Fixes memleak
Fixes Ticket5169
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-24 18:39:53 +02:00
Petru Rares Sincraian
84b252ba2a
fate: add anequalizer test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-24 14:54:06 +02:00
Diego Biurrun
4f98bb7b6d
msmpeg4: Remove commented-out debug logging code
2016-06-24 13:25:36 +02:00
Diego Biurrun
eedbeb4c27
msmpeg4: Remove some broken, commented-out cruft
2016-06-24 13:25:36 +02:00
Clément Bœsch
b77f62e27f
Merge commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3'
...
* commit 'ded4a6543dfb5a2f1d9f7fb8d3ab27a1872c22b3':
xtea-test: Use struct allocation functions from the API
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 11:16:52 +02:00
Clément Bœsch
b6310ab6b5
Merge commit '8131bd4c22ad59b040173f67a5b2edb75863e801'
...
* commit '8131bd4c22ad59b040173f67a5b2edb75863e801':
blowfish-test: Use struct allocation functions from the API
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 11:14:23 +02:00
Clément Bœsch
1ca383c8d4
Merge commit 'a86ef80494d759807a5ef8dd12838f0690092e37'
...
* commit 'a86ef80494d759807a5ef8dd12838f0690092e37':
blowfish-test: Return different values for different errors
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 11:10:35 +02:00
Clément Bœsch
2c45254a77
Merge commit 'b84f3a40034d28828c4ca639d012479a7eaace28'
...
* commit 'b84f3a40034d28828c4ca639d012479a7eaace28':
movenc: Write 'loci' geotag metadata for 3gp and mp4
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 11:08:33 +02:00
Clément Bœsch
7a1785014b
Merge commit 'f12a705ee570e16ca692c66b62821a2dbdf82566'
...
* commit 'f12a705ee570e16ca692c66b62821a2dbdf82566':
movenc: Factorize a function for finding a metadata entry and the associated language
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 11:01:40 +02:00
Clément Bœsch
8e934e4c33
Merge commit 'daec1651f1c0f8f8e704db375a2ecb364a722fa1'
...
* commit 'daec1651f1c0f8f8e704db375a2ecb364a722fa1':
movenc: Write ?xyz geotag metadata for mov files
This commit is a noop, see a3ec1d6abd
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 10:54:48 +02:00
Clément Bœsch
7414ae4d8a
Merge commit 'bc43131997a456ecdff160eab288395f5adb8d72'
...
* commit 'bc43131997a456ecdff160eab288395f5adb8d72':
mov: Also export loci altitude
This commit is a noop, see 08b7d19def
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 10:53:22 +02:00
Clément Bœsch
b1b5ba034f
Merge commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b'
...
* commit '94d8141c8cd96c176f7d4bdb74a95331ec7db19b':
mov: Append place name instead of overwriting for loci
This commit is a noop, see 1607f77494
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 10:51:13 +02:00
Clément Bœsch
c8c402201a
Merge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'
...
* commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3':
mov: Fix parsing short loci
This commit is a noop, see 50393bce31
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 10:49:05 +02:00
Clément Bœsch
9c4af99583
Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'
...
* commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd':
mov: Print reason of loci parsing failure
See 9e4f0cfc8f
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 10:45:57 +02:00
Clément Bœsch
6dd80591b8
Merge commit 'd34826c33d401929b2ff8aee161fd39ad0a73613'
...
* commit 'd34826c33d401929b2ff8aee161fd39ad0a73613':
mov: Add a comment referring to the standard that defines the loci box
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-24 10:44:00 +02:00
Muhammad Faiz
1b7eaead0c
avfilter/showcqt: set some frame properties
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-24 15:33:16 +07:00
Michael Niedermayer
6935aaa748
avcodec/flac_parser: Increase FLAC_MAX_SEQUENTIAL_HEADERS by 1
...
Fixes Ticket5343
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-24 03:34:42 +02:00
Matthieu Bouron
7e4e8fdd34
Merge commit '72d621069fc301b431fac36b5281699a362562f2'
...
* commit '72d621069fc301b431fac36b5281699a362562f2':
movenc: Add a missed const
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 22:30:37 +02:00
Matthieu Bouron
c60d328e67
Merge commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9'
...
* commit 'a79aafd0b4d37eda6f15dc68e6509d4e815290c9':
movenc: Add a test for VFR with b-frames, with a duration change at a fragment end
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 22:20:10 +02:00
Matthieu Bouron
b1e1da52fe
Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'
...
* commit 'e1eb0fc960163402bbb4e630185790488f7d28ed':
movenc: Use packets in interleaving queues for the duration at the end of fragments
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 22:02:31 +02:00
Michael Niedermayer
388f095766
avformat/g729dec: Fix av_log() formating string
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-23 21:37:05 +02:00
Michael Niedermayer
947daffa59
avcodec/libx264: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-23 21:36:02 +02:00
Clément Bœsch
8f4a2d4834
MAINTAINERS: purge a bunch of entries
...
This is definitely not complete.
Anton, Diego and Luca are still maintaining their code in Libav, but are
unwilling to do so in FFmpeg, so removing these entries will prevent
them from getting poked by our users.
Måns, Justin, Kostya and Jason left both projects a while ago.
2016-06-23 19:25:19 +02:00
Matthieu Bouron
d671652f6e
Merge commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7'
...
* commit 'fd4957d9c67996e7d218fd36b4168c9cb85f9ea7':
movenc-test: Test write_data_type
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 18:03:49 +02:00
Matthieu Bouron
dc62016c4b
Merge commit '71852a1ba89abc8749e309d9d662c49d47e19531'
...
* commit '71852a1ba89abc8749e309d9d662c49d47e19531':
matroskaenc: Provide output bytestream markers
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 17:57:34 +02:00
Clément Bœsch
a86fe0d738
tests/api: add .gitignore
...
Fixes regression since 5d48e4eafa
2016-06-23 17:57:22 +02:00
Matthieu Bouron
4e7a921282
Merge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'
...
* commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401':
movenc: Provide output bytestream markers for fragmented content
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 17:52:14 +02:00
Matthieu Bouron
625eb41086
Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'
...
* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
flvenc: Provide output bytestream markers
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 17:43:19 +02:00
Matthieu Bouron
5d75e46677
Merge commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca'
...
* commit 'db7968bff4851c2be79b15b2cb2ae747424d2fca':
avio: Allow custom IO users to get labels for the output bytestream
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-23 15:59:44 +02:00
Diego Biurrun
3c84eaae9d
h264: Eliminate unused but set variable
...
libavcodec/h264_slice.c:1384:9: warning: variable 'droppable' set but not used
2016-06-23 14:16:14 +02:00
Matthieu Bouron
55816c9269
lavc/mediacodec: increase buffer dequeue timeout when the codec needs to be drained
...
Increase buffer dequeue timeout when the codec needs to be drained as it
could happen that no input buffer is available when we receive a null
packet for the first time (meaning we are unable to signal end of stream
and mark the codec as draining).
Fixes potential loss of last frames after sending a null packet.
2016-06-23 14:14:15 +02:00
Matthieu Bouron
b316ebf46d
lavc/mediacodec: rely on buffer flags to detect end of stream
2016-06-23 14:14:15 +02:00
Matthieu Bouron
30e3a27119
lavc/mediacodec: re-indent after previous commit
2016-06-23 14:14:15 +02:00
Matthieu Bouron
a71d518575
lavc/mediacodec: discard 0-sized buffers
...
Their only purpose is to carry the end of stream flag.
2016-06-23 14:14:15 +02:00
Clément Bœsch
c8550e8244
ffprobe: print stereo3d information
...
Based on 8e757716c6
See https://github.com/mpv-player/mpv/issues/1045 for mk3d
elektranox.org samples.
2016-06-23 13:48:14 +02:00
Clément Bœsch
ccf942a0c2
ffprobe: refactor pkt side data printing
2016-06-23 13:48:14 +02:00
Clément Bœsch
78f5589b29
Merge commit '8e757716c61e0563a63829e30b02d5ba2a422ad6'
...
* commit '8e757716c61e0563a63829e30b02d5ba2a422ad6':
avprobe: Print stereo3d information
This commit is not merged as it doesn't apply at all in our tree. The
two following commits will add the same feature.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-23 13:47:01 +02:00
Derek Buitenhuis
a02766fb4d
avcodec: remove libutvideo wrapper support
...
The 10-bit decoding support is available now in native decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-23 13:04:11 +02:00
Paul B Mahol
dccea0ed0d
avcodec/sheervideo: fix YbYr format decoding
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-23 12:59:20 +02:00
Clément Bœsch
abb3cc46d5
Merge commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd'
...
* commit '0c4468dc185fa8b9e7d6add914595c5e928b24fd':
stereo3d: Add API to get name from value or value from name
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-23 12:38:51 +02:00
Clément Bœsch
5954730ba3
Merge commit 'd621b2f795684f7119057f986066060adbe84220'
...
* commit 'd621b2f795684f7119057f986066060adbe84220':
lavf: Raw G.729 demuxer
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-23 12:26:25 +02:00
Clément Bœsch
28dac0dc06
Merge commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7'
...
* commit '34effe816f9f3df2e6b8bc738e2b5a86a24fd0d7':
fate: Update fate-lavf-ts after commit 393596f9d5
This commit is a noop, see c0ff42bf64
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-23 12:16:42 +02:00
Clément Bœsch
84b39d3e14
Merge commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8'
...
* commit 'b8de14bcdf876c7e236a6dd2ad35342ff4b42cf8':
tools: Port to codec parameters API
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-23 12:14:45 +02:00
David Murmann
c3b0af7456
avformat/mov: add more datatypes in metadata handling
...
Implement variable sized big-endian integers, since these are found
in files created by ARRI cameras.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-23 11:40:32 +02:00
Clément Bœsch
c0ff42bf64
Merge commit '393596f9d51134d6e45d81ae129223f4faea1232'
...
* commit '393596f9d51134d6e45d81ae129223f4faea1232':
mpegtsenc: stop impersonating ses in sdt
This commit also includes the needed FATE updates later spotted by
Martin Storsjö and fixed in 34effe816f on
Libav side.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-23 08:17:31 +02:00
rogerdpack
bfbffbd7d8
dshow: avoid duplicate NULL check before free
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-23 03:18:16 +02:00
rogerdpack
9e907c040d
dshow: don't add two instances of same device to graphs
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-23 03:18:16 +02:00
Michael Niedermayer
18f687f737
MAINTAINERS: Remove Linux / PowerPC maintainer
...
See: [FFmpeg-devel] PPC64: PowerPC Maintainer information is incorrect
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-23 00:55:13 +02:00
Petru Rares Sincraian
f6c48a7316
fate: add apad test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-23 00:47:13 +02:00
Clément Bœsch
aef2d3d2b5
lavc: fix previous merge
2016-06-23 00:42:16 +02:00
Clément Bœsch
bcafc41a5a
Merge commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c'
...
* commit 'ffa190d0479d2370dd89c95692f822cbff2cc24c':
Move VLC and RL_VLC_ELEM structure definitions to a separate header
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-23 00:29:25 +02:00
Hendrik Leppkes
e799e2270c
Merge commit 'b23613268c6b56a8f9de7859562d82b4b88353d9'
...
* commit 'b23613268c6b56a8f9de7859562d82b4b88353d9':
avconv_dxva2: use the hwcontext API
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-22 23:36:37 +02:00
Hendrik Leppkes
0c312a4562
hwcontext_dxva2: support P010 10-bit surfaces
2016-06-22 23:28:47 +02:00
Petru Rares Sincraian
610c0770e3
fate: add test for amerge
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 23:05:33 +02:00
Hendrik Leppkes
3689efea3d
Merge commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8'
...
* commit 'c46db38cde8e8fd8ecb1c6602f10ec0e002f29a8':
hwcontext: add a dxva2 implementation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-22 22:38:49 +02:00
Michael Niedermayer
d0b21b28a3
avformat/flacdec: Fix seeking close to EOF
...
Fixes Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 21:10:37 +02:00
Michael Niedermayer
b0b3676e13
avcodec/flac_parser: Raise threshold for detecting invalid data
...
Fixes regression from Ticket5428
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 21:10:36 +02:00
Clément Bœsch
6c98398b0b
lavc/get_bits: add a logging context to check_marker()
...
Based on d338abb664
2016-06-22 20:07:49 +02:00
Clément Bœsch
7475a9351f
Merge commit 'd338abb664febbc2c7266af7818aab1f12dbc161'
...
* commit 'd338abb664febbc2c7266af7818aab1f12dbc161':
mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL
This commit is a noop.
Since check_marker() is still in get_bits.h in FFmpeg and shared amongst
decoders, a similar but different change will be committed in the next
commit in to serve the same purpose of this one (that is, passing a
logging context to the av_log() in that function).
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 20:05:03 +02:00
Clément Bœsch
575be7311c
Merge commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834'
...
* commit 'e4b38878da6b38ef5ca54ce14be985d6ae088834':
Move check_marker() from get_bits to mpeg4videodec
Not merged, check_marker() is used in various other places in FFmpeg.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:57:11 +02:00
Clément Bœsch
541e1c2c3b
Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'
...
* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
lavc: mark the old audio/video encoding API as deprecated
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:51:36 +02:00
Clément Bœsch
93f5a27313
Merge commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c'
...
* commit '2fb1d17a5a6b6ff8da2434cde0fda821f06f608c':
x86inc: Enable AVX emulation in additional cases
This commit is a noop, see e428f3b30c
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:40:49 +02:00
Clément Bœsch
1c85027afe
Merge commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600'
...
* commit '300fb0df84e9a563ed3b8a9b3d365abb6cf34600':
x86inc: Improve handling of %ifid with multi-token parameters
This commit is a noop, see 4bd5583ace
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:40:29 +02:00
Clément Bœsch
3d1b9383b7
Merge commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f'
...
* commit '8d02579fae756336ae2a88d521e8cf2f6b436a2f':
x86inc: Fix AVX emulation of some instructions
This commit is a noop, see 42be240ad6
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:39:13 +02:00
Clément Bœsch
a24cbbbfc4
Merge commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc'
...
* commit 'ba3eb745cc236765c916b74b39c1874da5c3aefc':
x86inc: Fix AVX emulation of scalar float instructions
This commit is a noop, see 8dd3ee9ddd
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:38:53 +02:00
Clément Bœsch
17fdffc9f8
Merge commit '8996515b137f962e3a8691241c285c96437b6c53'
...
* commit '8996515b137f962e3a8691241c285c96437b6c53':
avpacket: fix setting AVPacket.data in av_packet_ref()
This commit is a noop, see ed3a02547c
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:32:00 +02:00
Clément Bœsch
d4b1b3b06c
Merge commit 'e62ff72fc1052273deb708ba715f73e5187281d4'
...
* commit 'e62ff72fc1052273deb708ba715f73e5187281d4':
lavc: make avcodec_open2() fail when the timebase is not set for encoding
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-22 19:29:56 +02:00
Michael Niedermayer
70d48accd8
avcodec/tests/options: Set timebase
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 18:49:33 +02:00
Clément Bœsch
a444a50510
Merge commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f'
...
* commit '11de006babf735aafa3462d43dd2c02bb6ac6e2f':
Combine deprecation guards where appropriate
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-22 17:36:42 +02:00
Clément Bœsch
48ac4532d4
lavf/img2dec: add pnm pipe demuxers
2016-06-22 15:24:19 +02:00
Michael Niedermayer
99c3c3237b
avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed
...
The internal avctx bitrate is copied into codecpar after estimate_timings()
Fixes Ticket5646
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 14:16:58 +02:00
Michael Niedermayer
4fecb97fd3
avformat/utils: change bit_rate to 64 bit in estimate_timings_from_bit_rate()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 14:16:58 +02:00
Clément Bœsch
a9eda4b260
swr: fix time.h include
2016-06-22 14:00:08 +02:00
Clément Bœsch
5d48e4eafa
Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
...
* commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196':
tests: Move all test programs to a subdirectory
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-22 13:44:34 +02:00
Michael Bradshaw
989a614b70
libavformat/matroskaenc: omit segment UID for webm
...
SegmentUID is not a supported element in WebM. See:
http://www.webmproject.org/docs/container/#SegmentUID
Reviewed-by: Dave Rice <dave@dericed.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 12:12:46 +02:00
Clément Bœsch
5558ff3a9f
Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
...
* commit '257f00ec1ab06a2a161f535036c6512f3fc8e801':
Split global .gitignore file into per-directory files
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-22 11:28:51 +02:00
Clément Bœsch
85185578ce
lavc/qtrleenc: simplify FF_API_CODED_FRAME deprecation guard
2016-06-22 11:09:19 +02:00
Clément Bœsch
0491d6993a
lavc/error_resilience: remove unused skip_last_mv label
...
Unused since a7b8a6e704
2016-06-22 11:07:54 +02:00
Clément Bœsch
e6247a22c0
Merge commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b'
...
* commit '763d69bfb2f0094e99f43e657cfd2b0471361f6b':
Add some more deprecation guards
- psnr() deprecation is not merged within ffmpeg.c as we still use it in
non-deprecated code
- the XVMC chunk is not merged as we still apparently maintain it
- The guarding in lavc/qtrleenc.c could be simplified but merged anyway.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-22 11:06:04 +02:00
Matthieu Bouron
df3484f87c
lavc/videotoolbox: fix avcC extradata creation
...
Fixes properly ticket #5638 .
Since 772ad7142d PPS and SPS contain the
nal type byte.
This reverts commit b8d754c5d0 .
This reverts commit 8e47a99f57 .
2016-06-22 10:03:45 +02:00
Luca Barbato
4dbfcd0757
librtmp: Avoid an infiniloop setting connection arguments
...
The exit condition was missing.
CC: libav-stable@libav.org
2016-06-22 06:37:33 +02:00
Michael Niedermayer
e0faad837c
avformat/flvdec: Do not check last size if it could not be read due to EOF
...
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 03:02:47 +02:00
Michael Niedermayer
3f380b9b40
avformat/flvdec: Also print sum_flv_tag_size on size mismatches
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 03:02:47 +02:00
Michael Niedermayer
e8931d79cc
avformat/flvdec: Accept last size if its off by 1
...
Fixes part of Ticket5648
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-22 03:02:47 +02:00
Clément Bœsch
a4403e49b9
Merge commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376'
...
* commit 'b7e64fba7f37cc0399beae844f0a5dbef9219376':
Reduce the scope of some variables
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:40:56 +02:00
Clément Bœsch
00e122bc0f
Merge commit 'bc2a32969eb4db17677971def5ad5b936d9d1648'
...
* commit 'bc2a32969eb4db17677971def5ad5b936d9d1648':
rtsp: Parse SSRC attributes in the SDP
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:26:44 +02:00
Clément Bœsch
4873952f88
Merge commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a'
...
* commit '9ea78fd00a49f0691c1a5134eb59d4e5bb380a2a':
rtpdec: Always check if we have the next packet queued
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:24:30 +02:00
Clément Bœsch
91450cda2e
Merge commit '0c1d66a07917602303f129f5a5651faeec2415d5'
...
* commit '0c1d66a07917602303f129f5a5651faeec2415d5':
avconv_vaapi: fix double-free with some unsupported streams
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:22:51 +02:00
Clément Bœsch
475a686a01
Merge commit '885a9d6087315a85d98f7e89656ef01dc7104c4c'
...
* commit '885a9d6087315a85d98f7e89656ef01dc7104c4c':
pgssub: Fix subpicture colorspace and range
See 9779b62624
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:20:49 +02:00
Clément Bœsch
e4c07dc4b7
Merge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52'
...
* commit '1f77e634bb838f71ff21923b5e9fe3104c831c52':
colorspace: Add support for BT709
See 9779b62624
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:16:16 +02:00
Clément Bœsch
363d4a0e65
Merge commit '283226e11ccf50a71d25d150fbbf1743f74c6c49'
...
* commit '283226e11ccf50a71d25d150fbbf1743f74c6c49':
simple_idct_template: Fix strict aliasing violation
See 5df703aa1b
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:12:36 +02:00
Clément Bœsch
e276f21f99
Merge commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92'
...
* commit 'e9443105ea4e8bc1d826ddceeba2816488c6ce92':
avio: Remove a leftover comment
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:10:54 +02:00
Clément Bœsch
8df1dbd798
Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'
...
* commit '5afb94c817abffad030c6b94d7003dca8aace3d5':
Mark read-only tables as static
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:09:35 +02:00
Clément Bœsch
ea80e90e13
Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'
...
* commit '1f1ad8ace040a08edc2646ff638ca42a8828779f':
configure: Document --enable-libfontconfig
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:03:18 +02:00
Clément Bœsch
d0d9dbec2f
Merge commit 'def03d14687b9d089950ba8e45083e666de4eb68'
...
* commit 'def03d14687b9d089950ba8e45083e666de4eb68':
vf_frei0r: Drop overly verbose and broken debug output
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 22:00:12 +02:00
Clément Bœsch
8ef57a0d61
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
...
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-21 21:55:34 +02:00
Mark Thompson
fe498ef514
hwcontext_vaapi: Return all formats for constraints without config
...
No longer make a dummy device configuration to query. Instead, just
return everything we recognise from the whole format list. Also
change the device setup code to query that list only, rather than
intersecting it with the constraint output.
This makes hwupload more usable on mesa/gallium where the video
processor only declares support for RGB formats, making it unable to
deal with YUV formats before this patch. It might introduce some
different trickier failures in the internal upload/download code
because the set of allowed formats there has changed, though I didn't
find any obvious regressions with i965.
2016-06-21 20:42:22 +01:00
Mark Thompson
11b8030309
vaapi_encode: Fix fallback when input does not match any format
...
Just a typo. Add a comment to make it clearer what it's doing.
2016-06-21 20:42:22 +01:00
Aman Gupta
373b82066c
avformat/mpegts: include stream type for aac
...
this removes the need to probe to discover aac streams
inside mpegts containers, thus speeding up initial playback.
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-21 21:21:30 +02:00
Martin Storsjö
8c3c7b8920
dxva2_h264: Remove an unused variable
...
This was introduced by mistake in 39cdbb12aa (only one of the
added variables were really needed).
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-21 22:09:35 +03:00
Martin Storsjö
dc7501e524
checkasm: Issue emms after benchmarking functions
...
The functions may not clean up properly after using MMX
registers. For the normal testing calls, the checkasm_checked_call
functions will do the cleanup (and check that functions that
should clean up do it as well), but when benchmarking functions
that don't clean up, we don't currently properly clean up at all.
This causes issues if a benchmarked function is followed by testing
of a function that is supposed to not clobber the MMX/FPU state but
doesn't touch it at all.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-21 22:09:29 +03:00
Anton Khirnov
beb62dac62
Use AVFrame.pts instead of deprecated pkt_pts.
2016-06-21 19:54:42 +02:00
Anton Khirnov
32c8359093
lavc: export the timestamps when decoding in AVFrame.pts
...
Currently it's exported as AVFrame.pkt_pts, which is also the only use
for that field. The reason it is done like this is that lavc used to
export various codec-specific "timing" information in AVFrame.pts, which
is not done anymore.
Since it is confusing to the callers to have a separate field which is
used only for decoder timestamps and nothing else, deprecate pkt_pts and
use just AVFrame.pts everywhere.
2016-06-21 19:54:42 +02:00
Anton Khirnov
ac7bfd6967
lavfi: add a QSV scaling filter
2016-06-21 19:53:38 +02:00
Anton Khirnov
ad9c9440d5
qsvenc: support getting the session from an AVHWFramesContext
2016-06-21 19:53:38 +02:00
Anton Khirnov
a0524d9b1e
qsvdec: support getting the session from an AVHWFramesContext
2016-06-21 19:53:38 +02:00
Anton Khirnov
59e7361cc7
hwcontext: add a QSV implementation
2016-06-21 19:53:37 +02:00
Anton Khirnov
6f19bbcf85
qsvdec: move reading the user-provided session to qsv_decode_init()
...
This is a more appropriate place for it.
2016-06-21 19:52:19 +02:00
Anton Khirnov
e85f6f7f8d
lavc: allow using AVCodecContext.hw_frames_ctx for decoding
...
For now it will only be used by the default get_buffer2 callback for
allocating hw frames.
2016-06-21 19:52:17 +02:00
Clément Bœsch
9204a84998
Merge commit '5c31eaa9998b2185e0aa04d11adff128498dc14a'
...
* commit '5c31eaa9998b2185e0aa04d11adff128498dc14a':
Remove unnecessary get_bits.h #includes and add missing headers where needed.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 15:42:49 +02:00
Vittorio Giovara
40dd5166d2
truemotion2rt: Use ff_set_dimensions
2016-06-21 09:38:56 -04:00
Clément Bœsch
3801060cd0
Merge commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f'
...
* commit 'c11c693accaad65d3f4afa44c27f2338a2e3bf8f':
h264: Drop broken trace debug output
This commit is not merged as the debug was fixed in
94011f994a .
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 15:38:52 +02:00
Clément Bœsch
d12cce3fb2
Merge commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6'
...
* commit '5f1c3cbd524728317bf460259aa8f3ef5ec935c6':
vaapi: Drop pointless debug output
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 15:36:43 +02:00
Clément Bœsch
14762dd3f3
Merge commit '015c2d923902fcd562571993eaf1231ce388c7f0'
...
* commit '015c2d923902fcd562571993eaf1231ce388c7f0':
libopencore-amr: Fix ff_dlog()/av_log() invocations
The log changed in our tree in 4a28962454
is kept as is since it's the correct thing to do (the log mentions what
the first byte *was*, so it's refering to the source packet, not the
encoded bitstream).
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 15:30:16 +02:00
Vittorio Giovara
a816432337
pixdesc: Add new SMPTE 431, 432, and 2085 color properties
...
Appeared in H.264 2016/02.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-21 09:29:04 -04:00
Clément Bœsch
c01f1157ac
Merge commit '0f40c9098498ad90dbbd2380eb4269015e84bde4'
...
* commit '0f40c9098498ad90dbbd2380eb4269015e84bde4':
Drop pointless assert.h #includes
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 15:26:20 +02:00
Neil Birkbeck
5d560d38de
pixfmt: Add ARIB STD-B76 color transfer characteristic
...
Adding hybrid log-gamma (https://en.wikipedia.org/wiki/Hybrid_Log-Gamma )
based on the standardization in ARIB STD-B67:
http://www.arib.or.jp/english/html/overview/doc/2-STD-B67v1_0.pdf
The choice of enum value of 18 is consistent with HEVC:
http://phenix.it-sudparis.eu/jct/doc_end_user/current_document.php?id=10481
And also with latest proposal for color format in mkv:
https://mailarchive.ietf.org/arch/search/?email_list=cellar&gbt=1&q=Colour+Format+proposal
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-21 09:02:46 -04:00
Clément Bœsch
82439dec0f
Merge commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2'
...
* commit '74d98d1b0e0e7af444c933ea3c472494de3ce6f2':
mpegts: Validate the SL Packet Header Configuration
See e630ca5111
Our local timestamp_len > 64 is adjusted to > 63 to match the Libav
check and the actual specifications (14496-1, 10.2.2).
There is no need to request a sample as it violates the specifications
and such a file would likely be the result of a crafted/fuzzed sample.
On the other hand, the clipping of the value is kept for extra safety.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 14:46:36 +02:00
Matthieu Bouron
0cd5e281df
lavc/mediacodecdec_h264: use ff_h264_decode_extradata to extract PPS/SPS
...
Fixes playback of HLS streams on MediaTek devices which requires PPS/SPS
to be set in their respective csd-{0,1} buffers.
2016-06-21 14:20:57 +02:00
Clément Bœsch
72ed8d8bd2
Merge commit '1982d0cc561912d685a0c2dbe58bc19f50bae231'
...
* commit '1982d0cc561912d685a0c2dbe58bc19f50bae231':
fate: Add test for MTS2/MSS4
The timestamps differ because we use a more appropriate timebase.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 14:14:21 +02:00
Clément Bœsch
2c2957e23f
Merge commit '375cad096565b0796df2a307faae7619766f7c49'
...
* commit '375cad096565b0796df2a307faae7619766f7c49':
rtpdec_vp9: Support parsing the scalability structure
This commit is a noop, see cab237953e
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:44:35 +02:00
Clément Bœsch
f17c65ed83
Merge commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768'
...
* commit '943f4bea37dc8d510d2f43c0bbe0df59c9b34768':
rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log
This commit is a noop, see d50b3fe463
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:43:32 +02:00
Clément Bœsch
4e637eb54d
Merge commit 'b55e3633d3f60cf0f51269f25936409b79d2729e'
...
* commit 'b55e3633d3f60cf0f51269f25936409b79d2729e':
rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for unimplemented features
This commit is a noop, see 94dee9067a
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:41:35 +02:00
Clément Bœsch
c281028c4d
Merge commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc'
...
* commit '70c77fdfc1076fd7f6cd20079237ddc97e1a10bc':
rtpdec_vp9: Update header parsing to spec draft 02
This commit is a noop, see 43880f9716
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:38:54 +02:00
Clément Bœsch
d5fb087e03
Merge commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91'
...
* commit '33b83d89e3720aecc60b4df3d8021cbc5780dd91':
rtpdec_vp9: Make sure to free the temp buffer on close
This commit is a noop, see 03aa4cd22b
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:37:50 +02:00
Clément Bœsch
59fced9e26
Merge commit 'c26741332165a049717e6da84db13a24ee8edade'
...
* commit 'c26741332165a049717e6da84db13a24ee8edade':
Revert "mmaldec: autodetect by default" since it breaks linking on systems without mmal libraries
This commit is not merged as the previous one wasn't either.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:36:32 +02:00
Clément Bœsch
60e862c91f
Merge commit '33ac77e850efdfd0e8835950c3d947baffd4df45'
...
* commit '33ac77e850efdfd0e8835950c3d947baffd4df45':
mmaldec: autodetect by default
This commit is not merged (it will be reverted in the next one to
merge).
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:36:07 +02:00
Clément Bœsch
d16aefee5c
lavc/mmaldec: reduce some diffs with Libav missed in previous skipped merges
2016-06-21 13:35:36 +02:00
Clément Bœsch
ba5100ce84
Merge commit '74beead9bd596180bcac6108548fc0a86d8eb4ae'
...
* commit '74beead9bd596180bcac6108548fc0a86d8eb4ae':
mmaldec: limit internal buffering
See 14a90c9ef0
The introduction of the MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS check is
merged.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:32:57 +02:00
Clément Bœsch
a826ffb829
Merge commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720'
...
* commit '45a954f5aa35161a741fffd6c8bb92e9f91a1720':
mmaldec: print the MMAL format FourCC automatically
This commit is a noop, see d27a12cb09
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:25:09 +02:00
Clément Bœsch
7f2626ccda
Merge commit '84bba36846870c6269732351c022eeef094c6c83'
...
* commit '84bba36846870c6269732351c022eeef094c6c83':
configure: fix mmal build dependencies
This commit is a noop, see 0badf4564a
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:23:55 +02:00
Clément Bœsch
4db44ea76e
Merge commit 'ce589940c2cac936891e8bba275580d6efc41e8b'
...
* commit 'ce589940c2cac936891e8bba275580d6efc41e8b':
mmaldec: send only a single EOS packet on flushing
This commit is a noop, see dafe4cd29c
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:22:22 +02:00
Clément Bœsch
a92efb5987
Merge commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d'
...
* commit '46aaad78c3cf03d43e7c9ca1d4a8b8a71fb0527d':
mmaldec: correct package buffering accounting
This commit is a noop, see a55fbfa4c4
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:21:50 +02:00
Clément Bœsch
93c75640c9
Merge commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3'
...
* commit '9a382f363950c0aab1500aa0937f73bf4dde9ee3':
mmaldec: add vc1 decoding support
This commit is a noop, see b07cbf6724
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:21:06 +02:00
Clément Bœsch
c824c3c47c
Merge commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a'
...
* commit 'd52208e8d549d4c84a2a348aa3790b1a177e779a':
mmaldec: Add mpeg2 decoding support
This commit is a noop, see 7ebe12fc55
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:18:47 +02:00
Clément Bœsch
5ffbfe38a5
Merge commit '2689bb115ca64921789092148deaf213a0d94d2e'
...
* commit '2689bb115ca64921789092148deaf213a0d94d2e':
mmaldec: Fix avpriv_atomic_get usage
This commit is a noop, see da43e9e157
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:06:11 +02:00
Clément Bœsch
b5f9f16582
Merge commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1'
...
* commit '366ba2dee1f2b17825b42e2164d3b9879f0271b1':
mmaldec: Use av_assert0() instead of assert()
This commit is a noop, see c0152ebb9e
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 13:04:40 +02:00
Clément Bœsch
5605c1b3c0
Merge commit 'f2422b58756ba97e3cbadc190f1ed950aa201ec7'
...
* commit 'f2422b58756ba97e3cbadc190f1ed950aa201ec7':
testprogs: Mark some tables as static const
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 12:58:56 +02:00
Clément Bœsch
7cf4b442ce
Merge commit '5b1409c75563b4a3aca113c34d09e3b5442de47f'
...
* commit '5b1409c75563b4a3aca113c34d09e3b5442de47f':
fate: Add test for MSS1
Test was already present, see 849e55e58e .
The merge removes the audio decoding present in our version and
simplifies the rules.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 12:50:03 +02:00
Anton Khirnov
6ed0f70f97
avconv: factor out initializing stream parameters for streamcopy
2016-06-21 12:39:02 +02:00
Anton Khirnov
5fa255b65c
avconv: initialize output framerate earlier
...
This will be needed in the following commits.
2016-06-21 12:39:02 +02:00
Anton Khirnov
1e93c1e30f
avconv: do not set encoder options when streamcopy is used
2016-06-21 12:39:02 +02:00
Anton Khirnov
90944ee3ab
avconv: refactor selecting an encoder
...
Fail immediately if automatic encoder selection failed. Always set the
stream_copy/encoding_needed flags in one place.
2016-06-21 12:39:02 +02:00
Anton Khirnov
5e1840622c
avconv: fix handling attachments in init_output_stream
...
The current code assumes that encoding_needed is simply an inverse of
stream_copy, which is not true for manually attached files (for which
neither of those is true).
2016-06-21 12:39:02 +02:00
Anton Khirnov
73c6ec6d65
avconv: create simple filtergraphs earlier
...
We already have all the necessary information in open_output_file().
This makes the information about the stream/filtergraph mappings
available earlier.
2016-06-21 12:39:02 +02:00
Anton Khirnov
49670e4218
avconv: add a function for determining whether a filtergraph is simple
...
This makes the code easier to read.
2016-06-21 12:39:02 +02:00
Clément Bœsch
f36fcf7b6c
Merge commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869'
...
* commit '4b2e69397b84d1c1a29ffae6e9f106f2c32b1869':
dds: Add support for monochrome images
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 12:29:46 +02:00
Clément Bœsch
c8b0d2eb8c
Merge commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3'
...
* commit '6eb2505855fa832ba7d0a1c2fb9f92c41c5446e3':
dds: Drop gray-alpha swapping
This commit is not merged, see 139cbeb75e .
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 12:17:12 +02:00
Clément Bœsch
28dcf18706
Merge commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a'
...
* commit '39cdbb12aa2140520246bc4c3e22436b9f8a121a':
dxva2_h264: Unbreak compilation after 3176217c6
This commit is a noop. The compilation was fixed in the merge commit
itself (1534ef87c7 ). The additional local
unused sps is not merged.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 11:38:53 +02:00
Clément Bœsch
93a0f4a3cb
Merge commit '4012fe1ee819edc7689e182189e66c5401fb4b41'
...
* commit '4012fe1ee819edc7689e182189e66c5401fb4b41':
ape: Unbreak adaptcoeffs computation
This commit is a noop, see dd4fb2339f
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 11:30:29 +02:00
Clément Bœsch
2c0854f724
Merge commit '2e5bde956519ae19cedfa482e199518e495bcaf5'
...
* commit '2e5bde956519ae19cedfa482e199518e495bcaf5':
h264: eliminate max_contexts
This commit is a noop as max_contexts can change and mismatch the
nb_slice_ctx (see 507b01f899 ).
The file in the Ticket is not decodable anymore, so it was not possible
to check if that code path was triggerable some way or another, or even
test a different fix.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 11:29:01 +02:00
Anton Khirnov
58640fe89e
h264: handle frame recovery in h264_field_start()
...
This is a more appropriate place for this. H264Context.recovery_frame is
shared between frame threads, so modifying it where it is right now is
invalid.
2016-06-21 11:20:51 +02:00
Anton Khirnov
e26c64148b
h264: discard slices of redundant pictures right after parsing the slice header
...
Going through the whole decoder initialization process for a slice we
are not going to decode is unnecessary and potentially dangerous.
2016-06-21 11:20:26 +02:00
Anton Khirnov
6efc463858
h264: always set redundant_pic_count during slice header parsing
...
It is always checked in the surrounding code, so this make sure we don't
see a value from an old slice.
2016-06-21 11:20:20 +02:00
Anton Khirnov
606fb6c032
h264: call the hwaccel frame_start() from h264_field_start()
...
This is a more appropriate place for it.
2016-06-21 11:19:51 +02:00
Anton Khirnov
d1d7678040
h264: fix the check for mixed IDR/non-IDR slices
2016-06-21 11:19:19 +02:00
Anton Khirnov
b13fc1e344
h264: do not pass H264Context to h264_slice_header_parse()
...
This should make it more clear that this function does not need any
decoder-global state other than the parameter sets.
2016-06-21 11:18:44 +02:00
Anton Khirnov
996f13413b
h264: fix warnings in fill_filter_caches_inter()
...
The code does some weird casting to a 2-dimensional sub-array of
ref2frm. This is not necessary, since only one dimension is needed
there.
2016-06-21 11:18:15 +02:00
Anton Khirnov
bc7f426851
h264: drop tests whether the codec id is AV_CODEC_ID_H264
...
Those are unused remnants of the old SVQ3 code.
2016-06-21 11:17:59 +02:00
Anton Khirnov
8281cd5cb8
h264_cabac: drop an always true condition
2016-06-21 11:17:53 +02:00
Anton Khirnov
5c2fb561d9
h264: add H264_ prefix to the NAL unit types
...
This will prevent conflicts e.g. in code that deals with both h264 and
hevc.
2016-06-21 11:17:28 +02:00
Anton Khirnov
1cf2f3d334
h264_sei: drop an unnecessary h264dec.h include
...
The code does not depend on the h264 decoder anymore and only needs
information from h264_ps
2016-06-21 11:15:44 +02:00
Anton Khirnov
b24dafe105
lavc: drop unnecessary h264dec.h includes
2016-06-21 11:15:11 +02:00
Anton Khirnov
70b1dcef2d
h264: tighten the valid range for ref_frame_count
...
This field (which the spec calls max_num_ref_frames) must be less than
or equal to MaxDpbFrames, which is at most 16.
2016-06-21 11:14:07 +02:00
Anton Khirnov
f638b67e57
h264: move the parameter set definitions to a new header file
...
The PS parsing code is independent from the decoder, so it makes more
sense for it to have its own separate header.
2016-06-21 11:13:29 +02:00
Anton Khirnov
4e2f621248
svq3: stop using H264Picture
...
The SVQ3 decoder has been decoupled from the H.264 decoder, so it can
now use its own data type.
2016-06-21 11:13:08 +02:00
Anton Khirnov
251cbb4400
h264: create a new header for common h264 definitions
...
Move the NAL unit types into it. This will allow to stop including the
whole decoder-specific h264dec.h in some code that is unrelated to the
decoder and only needs some enum values.
2016-06-21 11:12:41 +02:00
Anton Khirnov
9df889a5f1
h264: rename h264.[ch] to h264dec.[ch]
...
This is more consistent with the naming of other decoders.
2016-06-21 11:11:26 +02:00
Anton Khirnov
f651c6a259
h264: factor out setting frame properties / side data
...
Right now this code is mixed with selecting the next output frame. Move
it to a separate function called from h264_field_start(), which is a
more appropriate place for this.
2016-06-21 11:10:58 +02:00
Anton Khirnov
19446dc5ff
h264: drop unused NAL_FF_IGNORE
2016-06-21 11:10:46 +02:00
Anton Khirnov
bcd91f1644
h264: move a per-field block from decode_slice_header() to field_start()
...
This is a more appropriate place for it.
2016-06-21 11:10:29 +02:00
Anton Khirnov
17e7c03e12
h264: only allow ending a field/starting a new one before finish_setup()
...
Doing this after ff_thread_finish_setup() is called is invalid and can
conflict with reads from the other thread.
2016-06-21 11:10:00 +02:00
Anton Khirnov
debca90863
h264: store {curr,max}_pic_num in the per-slice context
...
While the value of those variables will be constant for the whole frame,
they are only used in two functions called from slice header decoding.
Moving them to the per-slice context allows us to make the H264Context
passed to slice_header_parse() constant.
2016-06-21 11:09:21 +02:00
Anton Khirnov
f966498e43
h264: decode the poc values from the slice header into the per-slice context
...
Copy them into the decoder-global context in field_start(). This avoids
modifying the decoder-global context during bitstream parsing.
2016-06-21 11:08:56 +02:00
Anton Khirnov
54dd9b1cdd
h264: set mb_aff_frame in frame_start()
...
Avoid unnecessary modification of the decoder-global state in per-slice
code.
2016-06-21 11:08:32 +02:00
Anton Khirnov
8d36932c8d
h264: move the block starting a new field out of slice_header_parse()
...
There is no bitstream parsing in that block and messing with
decoder-global state is not something that belongs into header parsing.
Nothing else in this function depends on the value of current_slice,
except for two validity checks. Those checks are also moved out of
slice_header_parse().
2016-06-21 11:08:03 +02:00
Anton Khirnov
b25cd7540e
h264: pass a H2645NAL to slice header decoding
...
Replace the decoder-global nal_unit_type/nal_ref_idc variables with the
per-NAL ones. The decoder-global ones still cannot be removed because
they are used by hwaccels.
2016-06-21 11:07:10 +02:00
Clément Bœsch
dea0a2b69a
Merge commit 'e3c9041cfe2e6526802255583d27abf9a921863e'
...
* commit 'e3c9041cfe2e6526802255583d27abf9a921863e':
h264: allocate some tables per slice contexts, not threads
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 10:28:14 +02:00
Clément Bœsch
04aefe205b
Merge commit 'e0652795292223f8bc8e5bac019c1fca7323d23c'
...
* commit 'e0652795292223f8bc8e5bac019c1fca7323d23c':
h264: remove an artificial restriction on the number of slice threads
Tested with multiple runs of fate-h264 THREADS=50 THREAD_TYPE=slice
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-21 10:24:31 +02:00
Clément Bœsch
26cfafa52d
lavc/h264_slice: mark ref2frm as const pointers
2016-06-21 10:09:19 +02:00
James Almer
afd04058bc
avformat/oggparsevorbis: free base64 encoded data immediately after decoding it
...
It has no use afterwards and freeing it before calling ff_flac_parse_picture()
may help prevent OOM issues on memory constrained scenarios.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-20 23:04:42 -03:00
James Almer
8b5b756c4d
avformat/oggparsevorbis: use the base64 decode size macro
...
Allocate the memory needed for the decoded data rather than the
encoded data.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-20 23:04:35 -03:00
Muhammad Faiz
6031e5d1af
swresample/x86: add support for exact_rational
...
phase_shift and phase_mask is removed
generally exact_rational=on is faster than exact_rational=off
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-21 05:18:21 +07:00
Vittorio Giovara
523c4c5b70
fate: Add TrueMotion 2 RT tests
2016-06-20 15:51:34 -04:00
Vittorio Giovara
906ffed9b1
fate: Move Duck Truemotion 1 and 2 tests to vpx.mak
2016-06-20 15:49:09 -04:00
Paul B Mahol
470cd0c5fe
Add TrueMotion 2.0 Real Time decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-20 15:48:12 -04:00
Vittorio Giovara
cc58656aca
fate: Add tests for MagicYUV
2016-06-20 15:47:23 -04:00
Paul B Mahol
d78fd2fa21
Add MagicYUV decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-20 15:45:51 -04:00
Clément Bœsch
d0bde818ac
MAINTAINERS: update my entries
2016-06-20 21:32:23 +02:00
Benjamin Larsson
ce028bc350
Remove Benjamin Larsson from MAINTAINERS
...
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-06-20 11:19:45 -08:00
Petru Rares Sincraian
bc370c8f68
fate: add test for alimiter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-20 20:15:20 +02:00
Matthieu Bouron
0ea58059d6
lavc/h264_ps: add ff_h264_ps_uninit and use it
2016-06-20 16:09:09 +02:00
Matthieu Bouron
acfab2dce6
lavf/mov: ignore ctts entries that do not apply to a least one sample
...
Fixes packet pts of samples which contain ctts entries with count <= 0.
2016-06-20 15:43:14 +02:00
Clément Bœsch
0528410e04
Merge commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69'
...
* commit '4fd34e639d15b44e02686c9b4ef58c9c3c9b0a69':
h264: remove pointless setting of some variables in loop_filter
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 15:38:11 +02:00
Clément Bœsch
fabdb7505a
Merge commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc'
...
* commit '9c858ce33fa9b94ebc320dd9d9fa423e708e90cc':
h264: remove a pointless comment
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 15:36:44 +02:00
Clément Bœsch
4053989890
Merge commit 'b77fffa127663028169c5ed543956af4b9496c29'
...
* commit 'b77fffa127663028169c5ed543956af4b9496c29':
h264: make slice threading work with deblocking_filter=1
again label, and SLICE_SINGLETHREAD error handling are preserved as that
SLICE_SINGLETHREAD can be raised on a remaining case.
slice_context_count is also kept since it's still in use.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 15:34:26 +02:00
Clément Bœsch
c8f7a23319
Merge commit '370ddc7b38d6b27b54fc2f5ee5f3dd9506f8c7c8'
...
* commit '370ddc7b38d6b27b54fc2f5ee5f3dd9506f8c7c8':
h264: remove H264Context.pict_type
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 12:48:49 +02:00
Clément Bœsch
0ab1816315
Merge commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd'
...
* commit '56087ec0a29314d1860f6f0e6f40fbb9b40feccd':
h264: drop a pointless indirection
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 12:31:29 +02:00
Carl Eugen Hoyos
dcdf69561f
lavc/audiotoolboxdec: Forward extradata for QDMC and QDM2.
...
Fixes audiotoolbox decoding of QDMC and QDM2.
2016-06-20 12:23:59 +02:00
Clément Bœsch
cbe2dc7275
Merge commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a'
...
* commit '0e7772c5e4f1b31e2a3dda714ba4f89b1cca644a':
h264: remove unused H264SliceContext.rbsp_buffer
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 12:07:10 +02:00
Clément Bœsch
c957909a9f
Merge commit '7f045c4429e91688f1f2335dd347203431901c06'
...
* commit '7f045c4429e91688f1f2335dd347203431901c06':
h264: merge ff_h264_free_context() into h264_decode_end()
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 12:03:21 +02:00
Clément Bœsch
d98ca4b14c
Merge commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470'
...
* commit '99c554efc8b09c3f1bb2fb41c3da5431085f7470':
h264: eliminate low_delay
ff_print_debug_info2() is adjusted to allow a NULL pointer as low_delay.
It's only useful for MPEG codecs with the exception of H264.
Merged-by: Clément Bœsch <clement@stupeflix.com >
2016-06-20 11:47:40 +02:00
Clément Bœsch
38a2d9aeec
lavc/h264_parser: replace AVCodecContext with logging ctx in scan_mmco_reset()
2016-06-20 10:36:16 +02:00
Clément Bœsch
4fdea02d68
lavc/h264: add a logging ctx to ff_h264_pred_weight_table()
2016-06-20 10:36:16 +02:00
Matthieu Bouron
432891a96e
lavc/mediacodecdec{,_h264}: set FF_CODEC_CAP_SETS_PKT_DTS capability
...
And sets frames pkt_dts to AV_NOPTS_VALUE as we do not want lavc/utils
to overwrite the field with incorrect values as the decoder is
asynchronous.
2016-06-20 10:07:41 +02:00
Dan Dennedy
b8d754c5d0
lavc/videotoolbox: Fix videotoolbox compile error on OS X 10.8.
...
Fixes error:
libavcodec/videotoolbox.c:511:18: error: implicit declaration of function
'CMVideoFormatDescriptionCreateFromH264ParameterSets' is invalid in C99
This was added in 10.9:
https://developer.apple.com/reference/coremedia/1489818-cmvideoformatdescriptioncreatefr?language=objc
2016-06-19 21:52:56 -04:00
Marton Balint
e07b8d68f5
avformat/mux: do not call write_packet with a flush packet if header is not written
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-20 00:27:26 +02:00
Marton Balint
517fe64406
avformat/mux: do not call write_header multiple times if it fails the first time
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-20 00:27:26 +02:00
Thomas Mundt
b577d42183
doc/filters.texi: Move bwdif to correct alphabetical position
...
Signed-off-by: Thomas Mundt <loudmax@yahoo.de >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-19 19:24:03 -03:00
Michael Niedermayer
dfbb5de172
tests/api/api-codec-param-test: Do not directly access caps_internal
...
The caps_internal field has moved without major bump and direct
access causes crashes, found when testing 3.1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-20 00:08:45 +02:00
Michael Niedermayer
3fd0694a11
avformat/version: Change the version bumping comment
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-20 00:08:45 +02:00
Marton Balint
e32857f30e
ffplay: ensure that we buffer at least 1 second of content
...
In order to do that, we keep track of the total duration of packets in a packet
queue.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-19 23:35:22 +02:00
Marton Balint
8594a8fbf9
ffplay: factorize checking if a stream needs additional packets
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-19 23:35:22 +02:00
Marton Balint
cc16229d91
avformat/udp: replace packet_gap with bitrate option
...
We haven't had a stable release since the packet_gap addition, so probably it
is worth reworking the option to something that makes more sense to the end
user. Also add burst_bits option to specify maximum length of bit bursts.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-19 22:55:57 +02:00
Marton Balint
0a06569487
avformat/udp: do not accumulate packet_gap delay errors
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-19 22:54:57 +02:00
Thomas Mundt
8b7b52c863
avfilter/vf_bwdif: Change default to deinterlace all frames
...
Signed-off-by: Thomas Mundt <loudmax@yahoo.de >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-19 17:02:09 -03:00
Clément Bœsch
fd1d84bcf6
lavc/magicyuv: fix undefined behaviour introduced in 8a135a55b
...
Order of evaluation of parameters in C is not defined.
2016-06-19 19:01:14 +02:00
Carl Eugen Hoyos
e274113292
lavc/cafenc: Allow QDMC muxing.
2016-06-19 18:51:39 +02:00
James Almer
5f5a97dc3d
avcodec/qsvenc_h264: declare the QSVEncContext variable before using it
...
Should fix compilation.
Regression introduced by commit 63adb3602d
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-19 12:04:03 -03:00
Clément Bœsch
c3afe64d0c
Merge commit '5b35b290dd76db64f079b3940f6148c8f273fc17'
...
* commit '5b35b290dd76db64f079b3940f6148c8f273fc17':
h264: remove a stale comment
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-19 13:48:09 +02:00
Clément Bœsch
d5cfe23324
Merge commit '89ae244e78a8d636fbb8427a2da052b04cf710bd'
...
* commit '89ae244e78a8d636fbb8427a2da052b04cf710bd':
h264_refs: remove an unused parameter from ff_h264_fill_mbaff_ref_list()
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-19 13:45:59 +02:00
Clément Bœsch
222e7d23d0
Merge commit '755f79f84cbeb5d749fb120e55e0098a2d7663a0'
...
* commit '755f79f84cbeb5d749fb120e55e0098a2d7663a0':
h264_refs: make the H264Context const where possible
ff_h264_decode_ref_pic_list_reordering() and h264_initialise_ref_list()
do not have a const H264Context * as they modify the default_ref inside
that context.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-19 13:36:33 +02:00
Clément Bœsch
902862bb4b
Merge commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a'
...
* commit 'a2fd547839d3ef8f342b6f2c096d0887675d3b1a':
h264_refs: reorder functions to avoid forward declarations
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-19 13:04:17 +02:00
Clément Bœsch
98456d4d69
Merge commit '0ba471d7d864c712f45d7ac6aca4829aba025adc'
...
* commit '0ba471d7d864c712f45d7ac6aca4829aba025adc':
h264: eliminate copy_fields
Added a copy of default_ref which isn't present in Libav.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-19 13:00:28 +02:00
Clément Bœsch
0ed14bba12
Merge commit '72da8d9bb24d1b1bf74c2f1108650c0da0054d2e'
...
* commit '72da8d9bb24d1b1bf74c2f1108650c0da0054d2e':
h264_parser: remove the remaining dependencies on the h264 decoder
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-19 12:50:24 +02:00
Clément Bœsch
34ec084b84
lavc/h264: move history parsing variable to H264ParseContext
...
This makes h264_find_frame_end() not depend on H264Context anymore.
2016-06-19 12:38:28 +02:00
Clément Bœsch
48ea5433c8
lavc/h264_parser: pass logctx to h264_find_frame_end()
...
This helps removing the H264Context from the H264ParseContext.
2016-06-19 12:34:38 +02:00
Clément Bœsch
0bf5fd2e19
Merge commit '98c97994c5b90bdae02accb155eeceeb5224b8ef'
...
* commit '98c97994c5b90bdae02accb155eeceeb5224b8ef':
h264: decouple extradata parsing from the decoder
Main changes:
- move get_avc_nalsize() inside h264_parser.c and make it use
H264ParseContext instead of H264Context. This helps fixing
fate-flv-demux.
- Also use is_avc/nal_length_size from the H264ParseContext in various
places instead of the H264Context one as that's the fields now filled
by ff_h264_decode_extradata()
- h264_parse: dont fail decode_extradata_ps() due to nal split failure.
Change by Michael to fix decoding of h264/ref_10.avi.
Merged-by: Clément Bœsch <u@pkh.me >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-19 12:17:41 +02:00
Paul B Mahol
8a135a55b3
avcodec/magicyuv: check dimensions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-19 09:45:29 +02:00
Andrey Turkin
63adb3602d
libavcodec: factor out SEI generation for A53 captions
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-19 02:11:20 +02:00
Michael Niedermayer
0fcc252829
Revert "avfilter/trim: add compatibility layer to not break ABI used by ffmpeg"
...
This reverts commit 9219ec93b1 .
Fixes Ticket 5411
2016-06-19 01:19:32 +02:00
Clément Bœsch
b51d5c99b8
lavc/h264_parse: remove tabs introduced in a2922b5d
2016-06-18 14:10:00 +02:00
Clément Bœsch
5584f019b5
Merge commit '728d90a0c1973661a9e73da697bf4f90c9d19577'
...
* commit '728d90a0c1973661a9e73da697bf4f90c9d19577':
h264: decouple h264_sei from the h264 decoder
Main changes:
- SEI decoding doesn't have access to the debug flag in the codec context so a
few logging are dropped.
- naming of quincunx_sampling_flag and frame_packing_arrangement_type are kept
as they are in FFmpeg instead of respectively quincunx_subsampling and
arrangement_type used in Libav because the former match the specifications.
- don't reset the x264 build info once read in order to fix
fate-h264-lossless (change by Hendrik)
- H264Context.has_recovery_point and deprecated
AVCodecContext.dtg_active_format are set after ff_h264_sei_decode()
based on the SEI state since ff_h264_sei_decode() doesn't have access
to H264Context anymore.
- frame_packing_arrangement_type is not checked against <= 0 in
decode_postinit() since it is always read as a positive value with
get_bits(). This fixes a -Wtype-limits warning by GCC spotted by
Michael.
Side Notes:
- tested that ffprobe on the file from ticket #3652 still returns 4
keyframes
- tested that playback from ticket #3063 still works
Merged-by: Clément Bœsch <clement@stupeflix.com >
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-06-18 14:04:55 +02:00
Jerome Martinez
ec9f04423b
ffv1: Error out on unsupported format
...
Transparency is supported only by YUV and within specific bit depths.
2016-06-18 12:46:43 +02:00
James Almer
403a53c60e
avcodec/ffv1enc: silence warning about deprecated coded_frame
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-17 16:53:13 -03:00
Michael Niedermayer
4efbeadadc
avcodec/snow: Document BlockNode
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-17 21:48:34 +02:00
Michael Niedermayer
737f06577c
avcodec/snow: Remove unused function
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-17 21:48:34 +02:00
Martin Storsjö
105998fb5c
checkasm: Add tests for h264 idct
...
The tests are inspired by similar tests for vp9 by
Ronald Bultje.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-17 21:37:56 +03:00
Clément Bœsch
6cb550e933
lavc/videotoolbox: remove config_info maximum capacity
...
In case of extradata, config_info will contain two entries instead of
one.
2016-06-17 17:46:19 +02:00
Clément Bœsch
6fd58eba1c
lavc/videotoolbox: CFRelease() session
...
"When you are done with a decompression session you created, call
VTDecompressionSessionInvalidate to tear it down and then CFRelease to
release your object reference."
2016-06-17 17:46:19 +02:00
Clément Bœsch
2770e16d70
fate/h264: add test for ticket #631
2016-06-17 17:46:19 +02:00
Vittorio Giovara
846a3e78a5
mov: Support prores with multiple stsd
...
This function needs to return false, or data in the additional tables
will be skipped, and the decoder will not be able to decode frames
associated with them.
2016-06-17 11:38:33 -04:00
Vittorio Giovara
7672997004
mov: Implement support for multiple sample description tables
...
Store data from each stsd in a separate extradata buffer, keep track of
the stsc index for read and seek operations, switch buffers when the
index differs. Decoder is notified with an AV_PKT_DATA_NEW_EXTRADATA
packet side data.
Since H264 supports this notification, and can be reset midstream, enable
this feature only for multiple avcC's. All other stsd types (such as
hvc1 and hev1) need decoder-side changes, so they are left disabled for
now.
This is implemented only in non-fragmented MOVs.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-17 11:38:33 -04:00
Vittorio Giovara
187d719760
h264: Support AV_PKT_DATA_NEW_EXTRADATA
2016-06-17 11:05:33 -04:00
Vittorio Giovara
75872d77d2
lavc: Document AV_PKT_DATA_NEW_EXTRADATA
2016-06-17 11:02:40 -04:00
Kongqun Yang
54327c2b34
Add experimental support for vp9 in iso-bmff
...
Implemented according to the draft specification
"VP Codec ISO Media File Format Binding":
http://www.webmproject.org/vp9/#draft-vp-codec-iso-media-file-format-binding
'-strict -2' is required to use this feature.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2016-06-17 10:36:09 -04:00
Muhammad Faiz
7f1b503ec2
swresample/resample: do not increase phase_count on exact_rational
...
high phase_count is only useful when dst_incr_mod is non zero
in other word, it is only useful on soft compensation
on init, it will build filter with low phase_count
but when soft compensation is enabled, rebuild filter
with high phase_count
this approach saves lots of memory
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-17 16:02:49 +07:00
Muhammad Faiz
ee575acb8c
swresample/resample: add support for odd phase_count
...
because exact_rational does not guarantee
that phase_count is even
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-17 16:00:13 +07:00
Steve Lhomme
193a421994
d3d11va: don't keep the context lock while waiting for a frame
...
also fixes a deadlock found by Денис Кулаков <kudesnik33ra@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-17 08:39:41 +02:00
Rick Kern
8b069b1cd5
lavc/videotoolboxenc: remove unnecessary logging
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-16 21:22:13 -04:00
Rick Kern
2584299ae6
MAINTAINERS: Add myself for videotoolbox.c, remove vda* maintainer
...
Person in MAINTAINERS hasn't responded to a patch on the ML or private
email, and doesn't maintain the files according to git.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-16 21:16:24 -04:00
Rick Kern
8e47a99f57
lavc/videotoolbox: fix H.264 hwaccel init issue
...
Fixes VTDecompressionSessionCreate() error.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-16 21:06:45 -04:00
Rick Kern
143685a42b
lavc/audiotoolboxenc: fix dropped frames on iOS
...
AudioConverterFillComplexBuffer() doesn't always call its callback. A frame
queue is used to prevent skipped audio samples.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-16 21:02:41 -04:00
Yuri Zats
ebda8216dc
avformat/http: change seek_ret to int64
...
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-16 23:55:21 +02:00
Jan Sebechlebsky
f5273197dc
avutil/threadmessage.h: Fix swapped comments
...
Fix swapped descriptions of av_thread_message_queue_set_err_send
and av_thread_message_queue_set_err_recv.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-16 23:54:51 +02:00
James Almer
94011f994a
avodec/h264dec: fix compilation with -DTRACE
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-16 18:52:23 -03:00
Petru Rares Sincraian
c4a82194e0
fate: add test for agate
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-16 23:39:52 +02:00
Martin Storsjö
f1a9eee41c
x86: Add missing movsxd for the int stride parameter
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-17 00:11:21 +03:00
Paul B Mahol
6098d4b8a8
avcodec/sheervideo: check build_vlc for failure
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-16 23:05:30 +02:00
Niklas Söderlund
6fd4145a1e
lavd/v4l2: allow devices not implementing VIDIOC_G_PARM
...
Not all v4l2 devices implement the VIDIOC_G_PARM ioctl. This patch allow
ffmpeg to open such device and treat it the same as devices that do
implement the ioctl but returns that it do not implement the
V4L2_CAP_TIMEPERFRAME capability.
Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se >
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-16 16:27:35 +02:00
Michael Niedermayer
eaa11437a4
doc/APIchanges: Fill in some missing things
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-15 23:27:38 +02:00
Muhammad Faiz
f92b56de96
fate: add swr-resample_exact_async tests
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-16 00:21:39 +07:00
Carl Eugen Hoyos
aec96e233f
lavc/dpx: Support decoding 12 bit colourspace with transparency information.
2016-06-15 17:45:51 +02:00
Matthieu Bouron
346b3c5c41
lavc/mediacodec: re-indent after previous commit
2016-06-15 16:40:36 +02:00
Matthieu Bouron
e452abc5c2
lavc/mediacodec: refactor ff_AMediaCodecList_getCodecByType
...
Allows to select a codec (encoder or decoder) only if it supports a
specific profile.
Adds ff_AMediaCodecProfile_getProfileFromAVCodecContext to convert an
AVCodecContext profile to a MediaCodec profile. It only supports H264
for now.
The codepath using MediaCodecList.findDecoderForFormat() (Android >= 5.0)
has been dropped as this method does not allow to select a decoder
compatible with a specific profile.
2016-06-15 16:36:13 +02:00
Benjamin Steffes
5b95b4616a
avfilter/af_hdcd: Use int32_t instead of int for gaintable in hdcd filter.
...
Signed-off-by: Benjamin Steffes <benjaminst123@gmail.com >
(comment by ronald)
prevent the theoretical case where the container type (int)
would be 64 bit on some platforms, which would waste some space
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-15 14:30:50 +02:00
dsmudhar
7a2b9dd060
vf_codecview: added new options
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-15 13:56:07 +02:00
Benoit Fouet
2234566cfb
hls muxer doc: clarify segment splitting option
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-15 11:28:04 +02:00
Hendrik Leppkes
cb46b78b2e
os_support: use the appropriate stat functions matching the stat type
...
The stat struct is defined to stati64, which requires using the appropriate wstati/stati functions as well.
Fixes a whole bunch of compiler warnings as well as build breakage with the decklink avdevice.
Fixes trac #5640
2016-06-14 23:49:42 +02:00
Aman Gupta
ddffafc0b0
avformat/utils: in debug mode, print number of streams found before avformat_find_stream_info()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-14 21:37:21 +02:00
Aman Gupta
e9391ab121
avformat/mpegts: enhance logging in trace mode
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-14 21:34:23 +02:00
Michael Niedermayer
fa0097e008
avfilter/vf_telecine: Make frame writable before writing into it
...
Fixes Ticket 5627
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-14 18:08:56 +02:00
James Almer
ede4ec1f8f
x86/aacpsdsp: optimize add_squares loop
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-14 12:41:23 -03:00
Carl Eugen Hoyos
d5ded429f2
lavc/dpx: Support decoding 10 bit colourspace with transparency information.
...
Fixes one sample from ticket #5639 .
2016-06-14 17:02:34 +02:00
Stefano Sabatini
6bcc6fd55d
doc/muxers/mpegts: apply misc consistency/formatting fixes
2016-06-14 12:11:04 +02:00
Stefano Sabatini
4b5620446a
lavf/utils: fix timestamp trace log in estimate_timings() function
...
Use the correct timebase, also replace "stream" with "format" in the
context of the format.
2016-06-14 12:11:04 +02:00
Diego Biurrun
a2ddfadc2d
avdevice: Ignore timefilter test program
2016-06-14 11:14:06 +02:00
Diego Biurrun
d6c2c2796d
LICENSE: Fix silly typo
2016-06-14 11:14:06 +02:00
Diego Biurrun
84b2d3fb68
h264: Drop unused function check_opcodes()
2016-06-14 11:14:06 +02:00
Clément Bœsch
7dd8cd1933
lavc/h264_sei: fix broken style around green metadata code
2016-06-14 08:23:23 +02:00
Clément Bœsch
5342bb624d
lavc/h264: rename GreenMetaData to H264SEIGreenMetaData
...
Reduces diff for the next merge with Libav.
2016-06-14 08:23:23 +02:00
Clément Bœsch
b0ec36c9b1
lavc/h264_sei: reduce scope of parameters for green meta decode
...
This is again will help the merge as ff_h264_decode_sei will not have
access to H264Context anymore.
2016-06-14 08:23:23 +02:00
Clément Bœsch
fef89aae98
lavc/h264: move green meta logging out of the sei decoding
...
This will simplify the next Libav merge where SEI decoding doesn't have
access to the debug level anymore.
2016-06-14 08:23:23 +02:00
Martin Storsjö
cab237953e
rtpdec_vp9: Support parsing the scalability structure
...
We still only support one single layer though, but this allows
receiving streams that have this structure present even for
single layer streams.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-14 08:00:17 +02:00
Martin Storsjö
d50b3fe463
rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-14 08:00:17 +02:00
Martin Storsjö
94dee9067a
rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for
...
unimplemented features
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-14 08:00:17 +02:00
Martin Storsjö
43880f9716
rtpdec_vp9: Update header parsing to spec draft 02
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-14 08:00:17 +02:00
Martin Storsjö
03aa4cd22b
rtpdec_vp9: Make sure to free the temp buffer on close
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-06-14 08:00:17 +02:00
Michael Niedermayer
228568fc8a
fate: fate-filter-acrossfade needs samples
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-14 04:27:54 +02:00
Michael Niedermayer
00c4861f13
avformat/mpegts: adjust probe score for low check_count
...
Fixes mis-detection of tiff as mpegts
Fixes Ticket5565
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-14 02:20:10 +02:00
Marton Balint
9da27fb579
avformat/mux: factorize header writing code
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-13 22:43:22 +02:00
Marton Balint
301ead1313
avformat/mux: call deinit if write_header fails
...
Docs clearly states that av_write_trailer should only be called if
avformat_write_header was successful, therefore we have to deinit if we return
failure.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-13 22:43:22 +02:00
Marton Balint
4bee44007a
avformat/mxfdec: check if source_package is NULL
...
Fixes ticket #5554 .
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-06-13 22:43:22 +02:00
Clément Bœsch
7a2a8b541a
lavc/h264_sei: fix green metadata typo
2016-06-13 22:41:38 +02:00
Jérôme Martinez
878c3a3645
avcodec/ffv1dec: fix some unsupported pix_fmt
...
When checking pix_fmt mapping, some bitstreams are mapped to an
incorrect pix_fmt instead of being rejected (ENOSYS).
Actually, such bitstreams are not supported (FFmpeg encoder does not
produce such bitstream, such bitstream may come only from another
encoder for the moment).
- JPEG 2000 RCT 11/13/15/16 bit depths are mapped to a 8-bit FFmpeg
pix_fmt (e.g. bgr0), which is not expected.
- JPEG 2000 RCT 9/10/12/14 bit depths with alpha are mapped to a
FFmpeg pix_fmt without alpha (e.g. AV_PIX_FMT_GBRP9 for 9-bit with
alpha), which is not expected.
The order for choosing the pix_fmt is changed to the one used by YCbCr
selection (<=8 bit first).
" && !f->transparency" is added to the other lines.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-13 22:07:35 +02:00
Thomas Bernard
836f3555a8
avformat/au: Read MetaData from AU Sun audio file header
...
recognize title= album= artist= genre= track=
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-13 20:58:43 +02:00
Michael Niedermayer
4879841d15
avformat/dump: Show coded dimensions again
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-13 20:26:21 +02:00
Vittorio Giovara
05a4bacbf7
avpacket: Error out when creating 0-sized side data
...
This mimics the behaviour of other av_*_new_side_data().
This is not caught by the malloc check, since padding
is always added to the allocated size.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-13 13:31:21 -04:00
Thomas Volkert
1f872332c4
rtpdec_vc2hq: avoid magic number
2016-06-13 18:40:14 +02:00
Thomas Volkert
668fb1cb6a
rtpenc: packetizer for VP9 RTP payload format (draft v2)
2016-06-13 18:09:34 +02:00
Vittorio Giovara
bcc07e2576
pixdesc: Use C99 array to list color properties names
2016-06-13 11:51:18 -04:00
Michael Niedermayer
60de31e98c
avformat/utils: Export coded dimensions unconditionally
...
This fixes a API regression
Probably fixes Ticket5451
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-13 13:07:55 +02:00
Muhammad Faiz
6602361295
avfilter/graphparser: remove '\n' from parse_filter
...
this allow a filter to be written like this:
aformat =
sample_fmts = fltp|flt:
sample_rates = 44100|44800
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-13 16:17:53 +07:00
Muhammad Faiz
0b8dcb3349
doc/resampler: add exact_rational option
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-13 13:12:05 +07:00
Muhammad Faiz
241e250520
fate: add libswresample exact_rational test
...
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-13 12:36:09 +07:00
Muhammad Faiz
b8c6e5a661
swresample: add exact_rational option
...
give high quality resampling
as good as with linear_interp=on
as fast as without linear_interp=on
tested visually with ffplay
ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000, showcqt=gamma=5"
ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000:linear_interp=on, showcqt=gamma=5"
ffplay -f lavfi "aevalsrc='sin(10000*t*t)', aresample=osr=48000:exact_rational=on, showcqt=gamma=5"
slightly speed improvement
for fair comparison with -cpuflags 0
audio.wav is ~ 1 hour 44100 stereo 16bit wav file
ffmpeg -i audio.wav -af aresample=osr=48000 -f null -
old new
real 13.498s 13.121s
user 13.364s 12.987s
sys 0.131s 0.129s
linear_interp=on
old new
real 23.035s 23.050s
user 22.907s 22.917s
sys 0.119s 0.125s
exact_rational=on
real 12.418s
user 12.298s
sys 0.114s
possibility to decrease memory usage if soft compensation is ignored
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-13 12:36:01 +07:00
Matt Oliver
5ca44ebd99
lavu/intmath.h: fix compilation with msvc10.
...
Signed-off-by: Matt Oliver <protogonoi@gmail.com >
2016-06-13 13:49:24 +10:00
Matt Oliver
37787f2616
lavf/os_support.h: Fix for unicode filenames on windows.
...
Fixes #819 #5256 #5281
Signed-off-by: Matt Oliver <protogonoi@gmail.com >
2016-06-13 13:47:32 +10:00
Ilya87
be37a66971
Timeline function for the eq filter
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-13 01:57:22 +02:00
Michael Niedermayer
4a8ed314fb
avcodec/h264_slice: Add casts to suppress warnings
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-13 01:57:22 +02:00
James Almer
15f9189b9c
avformat/redspark: deobfuscate header decrypt code
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-12 17:26:43 -03:00
James Almer
8fdad638f9
avformat/redspark: remove av_malloc usage
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-12 17:26:40 -03:00
Clément Bœsch
aafdad1b45
lavc/videotoolbox: fix sps/pps mistake introduced in 1534ef87
2016-06-12 20:53:57 +02:00
Clément Bœsch
4df944920c
lavc/videotoolbox: fixes compilation after 1534ef87
2016-06-12 20:53:57 +02:00
Clément Bœsch
82d79970ed
lavc/vda_h264: fixes compilation after 1534ef87
2016-06-12 20:53:57 +02:00
Anton Mitrofanov
a833ff68f6
h264: Fix decoding delay for Intra only streams
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-06-12 20:29:29 +02:00
Anton Khirnov
90f469aa2b
lavc: add H.264 MVC profiles
2016-06-12 20:27:53 +02:00
Anton Khirnov
61f168ae34
h264: factor out setting the parameter sets for a frame
2016-06-12 20:27:53 +02:00
Anton Khirnov
6e92181bf8
h264: pass just the PPS to get_chroma_qp()
...
It does not need the whole context. This will simplify the following
commit.
2016-06-12 20:27:53 +02:00
Anton Khirnov
d1f539c97e
h264: merge the two reinit blocks in slice_header_parse()
...
The only difference is that the first of them contains a
ff_h264_flush_change() call. While that is not necessary in the second
block, it should cause no problems either.
Reduce the verbosity of the reinit log message from info to verbose,
since now it will be displayed during every decode session.
2016-06-12 20:27:53 +02:00
Anton Khirnov
3fba16ecd9
h264: factor starting a new field out of parsing the slice header
2016-06-12 20:27:53 +02:00
Anton Khirnov
bec993381c
h264: postpone generating the implicit MMCOs
...
Do it right before the MMCOs are applied to the DPB. This will allow
moving the frame_start() call out of the slice header parsing, since
generating the implicit MMCOs needs to be done after frame_start().
2016-06-12 20:27:53 +02:00
Anton Khirnov
2d410ebbaa
h264: decode the MMCOs into per-slice contexts
...
They are stored in the slice header, so technically they are per-slice
(though they must be the same in every slice). This will simplify the
following commits.
2016-06-12 20:27:53 +02:00
Anton Khirnov
39ab2ea531
h264: rename mmco_index to nb_mmco
...
The variable stores the number of mmco entries, so the current name is
misleading.
2016-06-12 20:27:53 +02:00
Anton Khirnov
7ab5d577a9
h264: move initializing the slice start out of h264_slice_header_parse()
2016-06-12 20:27:53 +02:00
Anton Khirnov
4cec43a9ee
h264: move calculating the POC out of h264_slice_header_parse()
...
This function does not do any bitstream parsing and it depends on the
current frame being allocated, so this will allow the frame_start() to
be moved out eventually.
2016-06-12 20:27:52 +02:00
Anton Khirnov
6dd996c7c8
h264: move building the reference list out of h264_slice_header_parse()
...
This does not do any bitstream parsing and will allow moving out other
code in later commits.
2016-06-12 20:27:52 +02:00
Anton Khirnov
0bad254300
h264: move initing the implicit pred weight table out of h264_slice_header_parse()
...
It depends on the reference list, so this will allow moving out the
reference list construction and consequently other code it depends on.
2016-06-12 20:27:52 +02:00
Anton Khirnov
ed9a20ebe4
h264: split reading the ref list modifications and actually building the ref list
...
This will allow postponing the reference list construction (and by
consequence some other functions, like frame_start) until the whole
slice header has been parsed.
2016-06-12 20:27:52 +02:00
Anton Khirnov
fa57059079
h264: move initialising the implicit pred weight table for MBAFF
...
Do it where the normal implicit table is initialised.
2016-06-12 20:27:52 +02:00
Anton Khirnov
7b50d60442
h264: call ff_h264_fill_mbaff_ref_list() when constructing the normal ref list
...
There is no real reason to call it separately.
2016-06-12 20:27:52 +02:00
Anton Khirnov
b16e9b9ac9
h264: move initialising the explicit pred weight table for MBAFF
...
Currently it's done in the code that initialises the ref list for
MBAFF, which is not a logical place for it. Move it to the function that
parses the pred table from the bitstream, which is analogous to what is
done for the implicit weight table as well.
2016-06-12 20:27:52 +02:00
Anton Khirnov
b93c0aed79
h264: drop an outdated comment
2016-06-12 20:27:52 +02:00
Anton Khirnov
77a1e2c5f8
h264: move direct mode inits out of h264_slice_header_parse()
...
This code does not do any bitstream parsing, it just initializes some
internal state.
2016-06-12 20:27:52 +02:00
Anton Khirnov
d06e4d8aab
h264: start splitting decode_slice_header()
...
That function is currently very long and entangles bitstream parsing and
decoder configuration. This makes the code much harder to read than
necessary.
Begin splitting the code that configures the decoder state based on the
slice header information from the parsing of the slice header.
2016-06-12 20:27:52 +02:00
Michael Niedermayer
c3ad63c6a3
avcodec/iff: Fix bytestream advance
...
Fixes Ticket5585
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-12 20:26:32 +02:00
Clément Bœsch
bd3fd467fe
Merge commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8'
...
* commit 'c8dcff0cdb17d0aa03ac729eba12d1a20f1f59c8':
h264: factor out calculating the POC count into a separate file
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-12 19:01:43 +02:00
Clément Bœsch
65d5f32fd7
Merge commit '113aeee6aed35cb786a9f6d69b0cb210f498b9da'
...
* commit '113aeee6aed35cb786a9f6d69b0cb210f498b9da':
h264_parser: move the H264DSPContext to the parser context
H264Context is kept locally as it is currently needed for logging
(h->avctx as log context) and for is_avc and nal_length_size. These
later fields will later be obtained when the extradata parsing is
decoupled from the decoder. This code will be updated accordingly when
that commit is merged.
Merged-by: Clément Bœsch <u@pkh.me >
2016-06-12 15:43:28 +02:00
Petru Rares Sincraian
b78b077c91
fate: add afade test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-12 15:05:48 +02:00
Clément Bœsch
83163577e2
lavc/h264: remove unused ff_h264_init_dequant_tables prototype
...
Unused since 1534ef87 / 3176217c .
2016-06-12 13:38:23 +02:00
Clément Bœsch
1534ef87c7
Merge commit '3176217c60ca7828712985092d9102d331ea4f3d'
...
* commit '3176217c60ca7828712985092d9102d331ea4f3d':
h264: decouple h264_ps from the h264 decoder
Main changes:
- a local GetBitContext is created for the various
ff_h264_decode_seq_parameter_set() attempts
- just like the old code, remove_sps() is adjusted so it doesn't remove
the pps.
Fixes decode with Ticket #631
http://ffmpeg.org/pipermail/ffmpeg-user/attachments/20111108/dae58f17/attachment.mp4
but see next point as well.
- ff_h264_update_thread_context() is updated to work even when SPS
isn't set as it breaks current skip_frame code. This makes sure we
can still decode the sample from ticket #631 without the need for
-flags2 +chunks. (Thanks to Michael)
- keep {sps,pps}_ref pointers that stay alive even when the active
pps/sps get removed from the available lists (patch by michaelni with
additionnal frees in ff_h264_free_context() from mateo)
- added a check on sps in avpriv_h264_has_num_reorder_frames() to fix
crashes with mpegts_with_dvbsubs.ts from Ticket #4074
http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket4074/mpegts_with_dvbsubs.ts
- in h264_parser.c:h264_parse(), after the ff_h264_decode_extradata() is
called, the pps and sps from the local parser context are updated with
the pps and sps from the used h264context. This fixes fate-flv-demux.
- in h264_slice.c, "PPS changed between slices" error is not triggered
anymore in one condition as it makes fate-h264-xavc-4389 fails with
THREADS=N (Thanks to Michael)
Merged-by: Clément Bœsch <clement@stupeflix.com >
Merged-by: Michael Niedermayer <michael@niedermayer.cc >
Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com >
2016-06-12 13:26:52 +02:00
Paul B Mahol
1a57b464cf
avcodec/sheervideo: add 10-bit interlaced RGB(A) support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-12 12:35:05 +02:00
Paul B Mahol
84efdabc94
avcodec/utvideodec: add support for UQRG and UQRA formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-12 01:07:23 +02:00
Carl Eugen Hoyos
4c9d1c6f9a
lavu/file_open: Use current directory for temporary files also on Android.
...
Fixes ticket #5620 .
2016-06-11 22:41:18 +02:00
Carl Eugen Hoyos
3da860fbcf
lavc/libutvideodec: Do not set bits_per_raw_sample.
...
It is not always 8 but never different from the pix_fmt property.
2016-06-11 22:38:41 +02:00
Paul B Mahol
3ecc59bc35
avcodec/utvideodec: fix multiple slices for UQY2 and other issues
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-11 21:31:49 +02:00
Dave Rice
5d12cfacde
avfilter/vf_histogram: indent histogram options
2016-06-11 18:40:55 +02:00
Dave Rice
91bc42528c
avfilter/vf_histogram: shortcuts for histogram options
2016-06-11 18:40:48 +02:00
Paul B Mahol
115e63c8d6
avcodec/utvideo: add support for UQY2
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-11 18:36:39 +02:00
Michael Niedermayer
b21f674876
avcodec/mpc8: Correct end truncation
...
Fixes Ticket5478
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-11 17:27:19 +02:00
Rick Kern
98a3355c6a
lavc/videotoolboxenc: set extradata when opening codec
...
VideoToolbox doesn't supply parameter sets until the first frame is done
encoding. This spins up a temporary encoder and encodes a single frame to
get this data.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-11 10:30:34 -04:00
Rick Kern
c5a5ca754b
lavc/videotoolboxenc: fix allocated buffer size
...
Allocates a buffer with padding, and with enough room for start codes when
length codes are smaller.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-06-11 10:30:34 -04:00
Ivan
c1f57e2f91
libavformat/flvenc: support for codec configuration change mid stream
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-11 10:54:43 +02:00
Ivan
52985768af
libavformat/flvenc: refactoring: extracted method for writing codec headers
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-11 10:54:43 +02:00
Michael Niedermayer
5fd73948bb
avformat/mp3dec: Increase probe score slightly when the whole data from begin to end is mp3
...
Improves score for 1000-frames-of-noise-encoded-with-lame.mp3 without file extension
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-11 02:58:00 +02:00
Mark Thompson
d4cd8e7f6a
vaapi_encode_h26[45]: Reject bitrate targets higher than 2^31
2016-06-10 21:18:58 +01:00
Michael Niedermayer
056a4ae771
avcodec/cfhd: Set dimensions unconditionally
...
Fixes Ticket5215
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-10 22:05:38 +02:00
Paul B Mahol
9e9286e9ed
avcodec/sheervideo: add support for 10-bit interlaced YCbCr(A) 4:2:2
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-10 17:17:12 +02:00
Paul B Mahol
f0e7b06453
avcodec/sheervideo: fix argx format support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-10 17:17:12 +02:00
Paul B Mahol
9d30690f20
swscale: add input support for gbrap10 pixel format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-10 17:17:12 +02:00
Paul B Mahol
8100426fe4
avutil: add 10-bit planar RGB with alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-10 17:17:12 +02:00
Timo Rothenpieler
d865e74e6d
ffmpeg: Add cuvid hwaccel support
2016-06-10 16:31:23 +02:00
Timo Rothenpieler
88e8aef9e9
avcodec/cuvid: add cuvid decoder
2016-06-10 16:31:23 +02:00
Michael Niedermayer
24f5136196
avcodec/mpegvideo: Do not clear the parse context during init
...
It is allocated before, this cannot work
Fixes Ticket5613
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-10 15:54:20 +02:00
Pedro Arthur
e616e9a4b8
swscale: fix ring buffer size when scaling slices of a frame
...
The ring buffer size should be able to store input lines
when there is not enough lines to output a single line.
2016-06-10 09:45:24 -03:00
Pedro Arthur
b5deacfb1f
swscale: fix crash with swscale-test when using slices
2016-06-10 08:50:57 -03:00
Paul B Mahol
2ed8baa614
avcodec/sheervideo: add support for 10-bit interlaced YCbCr(A) 4:4:4(:4)
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-10 11:26:18 +02:00
Michael Niedermayer
bb5bc08ba6
MAINTAINERs cleanup (remove myself from things i de facto dont maintain)
...
x86 is maintained entirely by others these days
ML, mostly too
remove myself from a few spots that have other maintainers and where i
just dont know the code that well anyway to do an ideal job
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-10 10:22:31 +02:00
Paul B Mahol
c156420bce
avcodec/sheervideo: fix prediction for ybyr format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-10 09:52:38 +02:00
Paul B Mahol
0a9e781b88
avcodec/sheervideo: fix predictions for c82p format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-10 00:25:36 +02:00
Mark Thompson
2940e196c5
vaapi_h265: cu_qp_delta should not be used in constant-QP mode
2016-06-09 21:15:39 +01:00
Mark Thompson
02fa1ad926
vaapi_h264: Add source version identifier as unregistered SEI
...
Contains the libavcodec version, the VAAPI version and the libva
driver vendor string.
2016-06-09 21:15:39 +01:00
Mark Thompson
48e2967cd5
vaapi_h264: Add support for SEI messages
...
Send buffering_period and pic_timing messages when in modes
targetting bitrate. Also adds NAL HRD parameters to VUI.
2016-06-09 21:15:39 +01:00
Mark Thompson
19d7667a81
vaapi_encode: Add support for writing arbitrary additional packed headers
2016-06-09 21:15:39 +01:00
Mark Thompson
081961f819
vaapi_h264: Add support for VUI parameters
...
Supports aspect ratio, colour format and timing information.
2016-06-09 21:15:39 +01:00
Kyle Swanson
765703498a
avfilter/af_loudnorm: add dual_mono option
...
Signed-off-by: Kyle Swanson <k@ylo.ph >
2016-06-09 13:06:30 -05:00
Michael Niedermayer
6826f16e4a
avformat/utils: Do not overwrite, but use sample_fmt from context
...
Fixes Ticket 3759
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-09 19:32:56 +02:00
Michael Niedermayer
218bb8b3f3
avformat/utils: Open decoder even if there are no packets if parameters are missing
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-09 19:32:56 +02:00
Michael Niedermayer
2a70e78a28
avformat/utils: Initialize st in loop
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-09 19:32:56 +02:00
Paul B Mahol
0c7fa152b9
avcodec/sheervideo: supports some other 8bit formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-09 15:30:27 +02:00
Paul B Mahol
e826ceeb55
avcodec/sheervideo: add interlaced YCbCr(A) 4:2:2:4 8-bit support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-09 13:17:38 +02:00
Anton Khirnov
2e4a7bd553
h264: drop unused H264Context.gb
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-06-09 11:19:15 +02:00
Michael Niedermayer
37bb600405
avutil/opt: Fix max/min checking in av_opt_set() for AV_OPT_TYPE_VIDEO_RATE
...
Fixes Ticket5618
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-09 10:35:13 +02:00
Michael Niedermayer
4888932c4d
avformat: Fix max value of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-09 10:35:13 +02:00
Michael Niedermayer
f2c8b666be
avfilter: Fix max value of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-09 10:35:13 +02:00
Michael Niedermayer
584fff9478
avdevice: Fix max value of AV_OPT_TYPE_VIDEO_RATE
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-09 10:34:42 +02:00
Paul B Mahol
131cb675cf
avcodec/sheervideo: add interlaced YCbCr(A) 4:4:4:4 8-bit support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-09 10:23:02 +02:00
James Almer
172af20852
x86/showcqt: use three operand format for some instructions
...
Fixes failures with yasm 1.1.0 and older
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-08 19:37:08 -03:00
James Almer
7d7fdd6532
x86/showcqt: add missing preprocessor checks
...
Old yasm/nasm versions don't support some of these
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-08 19:34:43 -03:00
Rostislav Pehlivanov
a04ae469e7
aacsbr: reduce element type mismatch warning severity
...
All HE-AAC samples with an LFE channel make this warning get spammed on
every frame. Turning off SBR for LFE channels makes sense (since it has
much less coefficients than normal channels do), so this error print is
of no value in this case.
It makes sense to keep the error in other cases, hence why it's still
around, degraded to warning severity since the decoder will still
attempt to decode without SBR.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-06-08 21:01:04 +01:00
Muhammad Faiz
2991d93520
avfilter/src_movie: call open_stream after guess_channel_layout
...
fix error 'Channel layout change is not supported' when
opening wav file
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-09 02:00:10 +07:00
Muhammad Faiz
a096d3ec47
avfilter/avf_showcqt: set range on fps/rate/r option
...
see Ticket #5618
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-09 01:16:26 +07:00
James Almer
82dbfccaf0
x86/aacdec: use HADDPS macro
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-08 14:18:18 -03:00
James Almer
99b899483e
avutil/x86util: move haddps sse emulation from showcqt
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-08 14:18:00 -03:00
Diego Biurrun
4f81f8dba7
Drop unnecessary golomb.h #includes
2016-06-08 18:51:57 +02:00
Diego Biurrun
197ae68e78
Drop unnecessary unary.h #includes
2016-06-08 18:51:56 +02:00
Diego Biurrun
6ac52f05a6
dvbsub_parser: Add missing mem.h #include
2016-06-08 18:51:56 +02:00
Mark Thompson
9d8664dd84
MAINTAINERS: Add myself as maintainer for VAAPI encoders
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-08 15:15:00 +02:00
Michael Niedermayer
f883f0b0bd
avcodec/h264: Put context_count check back
...
Fixes assertion failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-08 15:15:00 +02:00
Muhammad Faiz
1e69ac9246
avfilter/avf_showcqt: cqt_calc optimization on x86
...
on x86_64:
time PSNR
plain 3.303 inf
SSE 1.649 107.087535
SSE3 1.632 107.087535
AVX 1.409 106.986771
FMA3 1.265 107.108437
on x86_32 (PSNR compared to x86_64 plain):
time PSNR
plain 7.225 103.951979
SSE 1.827 105.859282
SSE3 1.819 105.859282
AVX 1.533 105.997661
FMA3 1.384 105.885377
FMA4 test is not available
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-08 16:09:43 +07:00
James Almer
49b0246635
avformat/matroskadec: force 48kHz sample rate when rescaling Opus inital padding
...
Mkvtoolnix stores the sample rate of the original stream as reported by the
"OpusHead" stream header instead of 48kHz, the actual sample rate of the Opus
stream.
Ignoring the stored sample rate and forcing 48kHz preserves the correct initial
padding when remuxing such files.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-06-07 20:32:25 -03:00
Michael Niedermayer
27c1eae55f
avcodec/h264: Fix off by 1 context count
...
Fixes fate-h264-xavc-4389 with slice threads
2016-06-07 23:32:34 +02:00
Paul B Mahol
c206a32435
avcodec/sheervideo: fix order of operations for raw lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-07 23:14:07 +02:00
Paul B Mahol
60bac785c3
avcodec/sheervideo: add support for 8-bit interlaced (A)RGB
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-07 22:47:12 +02:00
Paul B Mahol
fdf832a986
avcodec: add BitJazz SheerVideo decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-07 21:38:49 +02:00
Michael Niedermayer
c36fc857b5
avcodec/alsdec: Check r to prevent out of array read
...
No testcase known
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-07 21:10:22 +02:00
Lou Logan
1748eb02c8
doc/filters: remove outdated showwavespic example
...
Use "colors" option instead.
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-06-07 10:52:15 -08:00
Michael Niedermayer
e01b19dece
avformat/mpegts: Fix probing of mpegts with invalid ASC
...
Fixes Ticket5566
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-07 15:46:08 +02:00
Michael Niedermayer
a2e6c785ce
avformat/rawdec: Fix avg_framerate for h264
...
The framerate is 25 which is a fixed default and is wrong undo the 1 line
change which caused this regression
Only the avg_frame rate setting is removed
The timebase update is not done as there was a objection (see ML)
Fixes Ticket 5444
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-07 14:08:13 +02:00
Diego Biurrun
81f769fa12
gsm: Move requant_tab table to the gsm tables file
...
This avoids duplicating the table in the gsm template file.
Also adjust the table type to uint8_t to save space.
2016-06-07 13:22:22 +02:00
Diego Biurrun
42dc214323
mpc: Drop unused GetBitContext context member
2016-06-07 13:09:57 +02:00
Diego Biurrun
85b8403c6f
svq1enc: Drop unused GetBitContext context member
2016-06-07 13:09:57 +02:00
Diego Biurrun
6d8fd614ff
vorbis: Kill some pointless debug code
2016-06-07 13:09:57 +02:00
Diego Biurrun
59c6509d9f
mss2: Drop a silly assert
2016-06-07 13:09:57 +02:00
Diego Biurrun
b668662939
get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes
...
This avoids the danger that get_bits.h might get indirectly #included before
BITSTREAM_READER_LE is defined.
Also sort headers into canonical order where appropriate.
2016-06-07 13:09:57 +02:00
Diego Biurrun
09c4e5c598
indeo2: Drop disabled big-endian ir2_codes table
...
Only the little-endian variant of the table is ever used.
2016-06-07 13:09:57 +02:00
Diego Biurrun
b7f98659f2
Remove unnecessary get_bits.h #includes
2016-06-07 13:09:57 +02:00
Matthieu Bouron
1729387c7a
lavc/mediacodec: improve error messages
2016-06-07 10:22:27 +02:00
Matthieu Bouron
93f4d1646e
lavc/mediacodec: bypass width/height restrictions when looking for a decoder
...
Codec width/height restrictions seem hardcoded at the OMX level and
seem arbitrary. Bypassing those restrictions allows a device to decode
streams at higher resolutions.
For example it allows a Nexus 5 to decode h264 streams with a resolution
higher than 1920x1080.
2016-06-07 10:22:20 +02:00
Matthieu Bouron
cb89fd2334
lavc/mediacodec: rename MediaFormat field clazz to mediaformat_class for consistency
2016-06-07 10:20:44 +02:00
Matthieu Bouron
56ef387e21
lavc/mediacodec: move struct declarations at the begin
2016-06-07 10:20:44 +02:00
Matthieu Bouron
79efd3b8b8
lavc/mediacodec: rename jfields_mapping to jni_amediacodeclist_mapping
2016-06-07 10:20:36 +02:00
Matthieu Bouron
f2e7f9966e
lavc/mediacodec: do not delete a local reference twice in case of error
2016-06-07 10:18:11 +02:00
Michael Niedermayer
153ab83bd3
avcodec/utils: check skip_samples signedness
...
Fixes Ticket5528
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-07 04:31:39 +02:00
Muhammad Faiz
77d4dfbec6
avfilter/af_firequalizer: add zero_phase option
...
simply by substracting pts to compensate delay
also handle AV_NOPTS_VALUE
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-07 07:55:48 +07:00
Michael Niedermayer
e7f658be57
avdevice/dshow: Fix frame rate
...
Fixes: Ticket5526
Tested-by: kgp700
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-07 02:32:13 +02:00
Martin Vignali
a2b2af791c
Changelog : add OpenExr improvements
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-07 00:17:20 +02:00
Timo Rothenpieler
808356c61c
avcodec/nvenc: Check capabilities for interlaced encoding
2016-06-06 23:52:55 +02:00
Michael Niedermayer
a5eb70ad95
avformat/mpegts: Do not trust BSSD descriptor, it is sometimes not an S302M stream
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 21:56:51 +02:00
Paul B Mahol
2a48a75a6f
sgirledec: simplify, no need to use reget buffer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-06 12:05:02 -04:00
Paul B Mahol
6e2ad28cf7
aic: add frame threading support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-06 12:03:20 -04:00
Vittorio Giovara
c3ed259e4f
fate: Move Canopus decoder tests to a separate file
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-06 11:59:53 -04:00
Vittorio Giovara
20a8c78ce0
avconv: Do not copy extradata if source buffer is empty
...
Fixes clang-usan runtime error "null pointer passed as argument 2,
which is declared to never be null" while streamcopying.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-06-06 11:56:21 -04:00
Martin Vignali
9511a0895d
avcodec/exr: indent b44 uncompress function
2016-06-06 15:59:18 +02:00
Martin Vignali
bc1f3dfaa3
avcodec/exr: fix decoding of B44 exr when all channel doesnt have the same pixel type
2016-06-06 15:42:34 +02:00
Martin Vignali
df7cd4176a
avcodec/exr: move channel_line_size to thread data
...
In order to be used by b44 uncompress.
2016-06-06 15:42:30 +02:00
Martin Vignali
03152e74df
avcodec/exr: improve pxr24 uncompress
...
Fix pxr24 uncompress when all channels doesnt have the same pixel type.
The expected length after zip decoding, is now calculated channel by channel.
2016-06-06 15:39:46 +02:00
Martin Vignali
16107aeaf3
avcodec/exr: remove unneed scanline_size var
2016-06-06 15:39:39 +02:00
Martin Vignali
42297d8419
avcodec/exr: fix tile decoding when all channels doesnt have the same pixel type
...
Also simplify the tile code, sharing more code with the scanline mode.
2016-06-06 15:39:22 +02:00
Martin Vignali
d24eb9a3c6
avcodec/exr: indent the if (layer_match) part
2016-06-06 15:39:06 +02:00
Martin Vignali
753088a2a4
avcodec/exr: fix layer detection
...
Only test a channel if the layer name match.
Avoid to try to mix channel between the main layer (rgba layer),
and the layer request by the user.
2016-06-06 15:38:35 +02:00
Michael Niedermayer
43a4276c69
avcodec/bmp_parser: Check fsize
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 14:32:48 +02:00
Michael Niedermayer
37005e65eb
avcodec/bmp_parser: reset state
...
Fixes part of ticket 5598
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 14:30:40 +02:00
Michael Niedermayer
250b620d29
avcodec/bmp_parser: Fix remaining size
...
Fixes part of ticket 5598
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 14:27:20 +02:00
Michael Niedermayer
bfe945ac3a
avcodec/bmp_parser: Fix frame_start_found in cross frame cases
...
Fixes part of ticket 5598
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 14:01:43 +02:00
Michael Niedermayer
b5bc436ebc
avformat/matroskadec: Fix rounding error with codec_delay
...
Fixes Ticket5509
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 05:01:34 +02:00
Michael Niedermayer
bacc4b6e81
avcodec/wmalosslessdec: Use unsigned operations for overflowing cases
...
Fixes undefined behavior in fate-lossless-wma24-2
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 02:24:22 +02:00
Michael Niedermayer
5a8b41b4a7
avformat/movenc: Skip unsupported video tracks in timecode generation
...
Fixes Ticket5414
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 01:30:48 +02:00
Michael Niedermayer
abc957e896
avfilter/af_amix: dont fail if there are no samples in output_frame()
...
Fixes Ticket5326
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-06 00:31:05 +02:00
Vivekanand
b092ee701f
avformat/allformats: Making av_register_all() thread-safe.
...
When multiple threads tries to call av_register_all(), the first thread sets
initialized to 1 and do the register process. At the same time, other thread might
also call av_register_all(), which returns immediately because initialized is set to 1
(even when it has not completed registering codecs). We can avoid this problem
if we set initialised to 1 while exiting from function.
Github: Closes #196
2016-06-05 23:48:12 +02:00
Michael Niedermayer
f730367a60
avcodec/mpeg4videodec: Fix default low_delay flag value if not coded
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 20:55:09 +02:00
Michael Niedermayer
87c53e5354
avcodec/mpeg4videodec: Print low_delay value with -debug 1 in decode_vol_header()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 20:19:57 +02:00
Thomas Mundt
a0a4a4b370
avfilter/vf_colormatrix: add bt.2020 colorspace
...
Signed-off-by: Thomas Mundt <loudmax@yahoo.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 19:46:38 +02:00
Thomas Mundt
2e395bbccf
avfilter/vf_colormatrix: increase precision
...
Signed-off-by: Thomas Mundt <loudmax@yahoo.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 18:47:36 +02:00
Michael Niedermayer
13aae86a2b
avutil/frame: Assert that width/height/channels is 0 for the destination of av_frame*_ref()
...
This should detect caes where these functions are called in unclean destinations
2016-06-05 17:12:35 +02:00
Michael Niedermayer
3bc060f366
doc/examples/transcoding: Use the decoders pixel format if the encoder does not list which are supported
...
This affects rawvideo and wraped_avframe, no others are affected atm
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 17:10:15 +02:00
Michael Niedermayer
134cba728b
Seperate x264rgb encoder and only enable when its actually supported
...
This avoids enabling and building the x264rgb encoder when its actually not supported and
thus would not work
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 17:04:29 +02:00
Denis Charmet
38f99017e6
vp9: Return the correct size when decoding a superframe
...
According to avcodec.h, avcodec_decode_video2 should return the number of
bytes used if a frame was decoded.
The current implementation returns size - used size of all the subframes.
This fixes the VLC's bug https://trac.videolan.org/vlc/ticket/16836 .
The superframe is always fully consumed.
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-06-05 16:58:04 +02:00
Michael Niedermayer
2ccf9ae6cc
avformat/format: Print debug info when probe score is increased due to mime type
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 16:35:40 +02:00
Michael Niedermayer
5fb6e39dd1
avcodec/cfhd: clear idwt_buf on allocation
...
This avoids use of uninitialized variables and might make bugs in general
easier to reproduce
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 15:41:50 +02:00
Michael Niedermayer
f90c9c306f
Check av_dup_packet() return code
...
Fixes: CID1338320
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 15:22:59 +02:00
Michael Niedermayer
39c0b22df4
avcodec/mpegvideo: Deallocate last/next picture earlier
...
Fixes regression with mplayers direct rendering and reduces buffer count
pressure in some cases
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-05 02:08:54 +02:00
Michael Niedermayer
bb3388fd60
avformat/dump: Print tbc value
...
Fixes regression of av_dump_format()
Fixes part of Ticket 5444
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-04 21:56:34 +02:00
Michael Niedermayer
d953b2857b
avcodec/utils: initialize delay in avcodec_parameters_to_context()
...
Fixes lost codec delayy
Should fix Ticket5509
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-04 20:46:16 +02:00
Timo Rothenpieler
7c55f5d782
avcodec/nvenc: Don't set packet duration
...
It's not expected to be set on video packets and causes issues in
ffmpeg.c.
2016-06-04 12:20:59 +02:00
Muhammad Faiz
1e6a0c9d14
avfilter/avf_showcqt: render default font at 960x16
...
and let ffmpeg scaler scale it
this impoves quality
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-04 14:05:04 +07:00
Michael Niedermayer
958bf659d8
avdevice/lavfi: Do not set avg_frame_rate to the timebase
...
Fixes regression
Fixes Ticket5422 (The timebase is 1/25k but the fps are not 25k)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-04 02:10:10 +02:00
Michael Niedermayer
b28e102875
avformat/version: Add Ticket5421 to list of tickets possibly affected by a major bump
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-03 23:09:19 +02:00
Michael Niedermayer
fc07972582
avformat/dump: Use codec and QP limits from AVCodecContext
...
Fixes regression
Fixes Ticket5421
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-03 22:26:00 +02:00
Jan Sebechlebsky
0e84eee719
libavutil/fifo: Fix fifo grow step
...
Fifo was reallocating always to twice of the requested size.
This fixes it to reallocate to requested size, or twice of the
original size - whichever is greater.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-03 14:49:56 +02:00
Nicolas George
8b05a7ffe4
lavf/udp: fix dead code.
...
Since d607861 , service can not be NULL, only "0".
An UDP address with neither local port nor address leaves both
service and node to their default value, and POSIX specifies
that they are not allowed to be both NULL; "0" is equivalent
to an unspecified port for all currently known protocols.
Fix CID 1341570.
2016-06-03 12:46:02 +02:00
Thomas Bernard
1f8c0e44cb
avformat/au: Write MetaData in AU Sun audio file header
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-03 12:18:57 +02:00
Matthieu Bouron
12f47539ca
lavc/mediacodecdec_h264: rename input_ref to input_pkt
2016-06-03 10:20:54 +02:00
Matthieu Bouron
15432a903e
lavc/mediacodecdec_h264: switch to new BSF API
2016-06-03 10:20:54 +02:00
Matthieu Bouron
e0df56f25d
lavc/vaapi_encoder_{h264,h265}: fix bad format warning
2016-06-03 10:09:39 +02:00
Michael Niedermayer
79b6c9acd5
fate/prores: use aac fixed for audio to fix fate failures on arm
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-03 04:35:59 +02:00
Michael Niedermayer
e78515f2ae
tests/fate/h264: Add test for xavc and somewhat odd pps/sps
...
(Ticket 4389)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-03 01:42:57 +02:00
Lars Kiesow
e9bb80d3dc
doc/filters: Remove duplicated setdar example
...
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-06-02 15:01:53 -08:00
Paul B Mahol
e8a236add8
avcodec/magicyuv: set correct size of last slice for each plane
...
Fixes invalid read.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-02 22:43:51 +02:00
Derek Buitenhuis
cc4ab320cf
MAINTAINERS: Remove myself
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-06-02 09:25:37 -08:00
Michael Niedermayer
ad72d7d299
avformat: Copy properties from internal context
...
Fixes Ticket5467 "Lossless j2k information no longer shown"
Based on suggestion by Hendrik Leppkes
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-02 16:57:49 +02:00
Michael Niedermayer
3402871f36
avcodec/h264_refs: Fix pps_ref_count with multiple PPS
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-02 14:51:49 +02:00
Michael Niedermayer
a8289d2407
avcodec/h264_refs: Remove unused pps_count
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-02 14:48:12 +02:00
Michael Niedermayer
4865252c08
avformat/udp: Protect write to circular_buffer_error by mutex
...
This isnt really needed on most platforms but
fixes CID1362183
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-02 13:41:04 +02:00
Muhammad Faiz
1b05521bb7
avfilter/avf_showcqt: full chroma blending on draw_axis_yuv
...
improve quality on axis drawing with yuv422p and yuv420p format
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-06-02 16:14:16 +07:00
Paul B Mahol
a3c2a9c736
avcodec/magicyuv: fix decoding of raw slices
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-06-02 06:59:46 +02:00
Mark Thompson
7e0623b70b
vaapi: Enable more libva surface formats
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-02 01:40:51 +02:00
Andriy Lysnevych
2fe04630e7
avcodec/avpacket: Respect payload offset in av_grow_packet
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-02 00:52:22 +02:00
Michael Niedermayer
d1efdd54f2
avformat: Document where the AVOption names can be found for the fields of AVFormatContext
...
Missing docs found by: nevcairiel
RFC: should we add support so that the C field names always work as av option names/keys ?
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-01 18:12:45 +02:00
Michael Niedermayer
b8426b865e
avcodec: Document where the AVOption names can be found for the fields of AVCodecContext
...
Missing docs found by: nevcairiel
RFC: should we add support so that the C field names always work as av option names/keys ?
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-01 18:12:39 +02:00
Michael Niedermayer
003a9e4854
avutil/frame: Document avcodec_get_frame_class() and the option naming system
...
Missing docs found by: nevcairiel
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-01 18:12:34 +02:00
Michael Niedermayer
77ba4a7843
library.mak: Put -Umain back for tests
...
Fixes build on mingw32 with SDL
reverts one line from 96d616052b
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-01 16:32:08 +02:00
Neil Birkbeck
785038c92c
lavu: Adding ARIB STD-B67 (hybrid log-gamma) enum value and transfer function.
...
Adding hybrid log-gamma (https://en.wikipedia.org/wiki/Hybrid_Log-Gamma )
based on the standardization in ARIB STD-B67:
http://www.arib.or.jp/english/html/overview/doc/2-STD-B67v1_0.pdf
The choice of enum value of 18 is consistent with HEVC:
http://phenix.it-sudparis.eu/jct/doc_end_user/current_document.php?id=10481
And also with latest proposal for color format in mkv:
https://mailarchive.ietf.org/arch/search/?email_list=cellar&gbt=1&q=Colour+Format+proposal
The implementation assumes a nominal input range of [0, 1], which is
consistent with HEVC.
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-06-01 16:32:08 +02:00
Piotr Bandurski
4c7d3e827c
avformat/isom: add MagicYUV FourCCs
2016-06-01 14:59:06 +02:00
Paul B Mahol
77f9c4b7aa
avocdec: add MagicYUV decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-31 22:37:09 +02:00
Michael Niedermayer
d0388bd32e
avcodec/bmp_parser: Fix state
...
Fixes Ticket5598
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-31 22:13:51 +02:00
Timo Rothenpieler
e5babccfbc
avcodec/nvenc: Refactor timestamp generation logic
...
Directly adapted from libav
2016-05-31 18:59:37 +02:00
Timo Rothenpieler
69c25c0ad7
avcodec/nvenc: forward frame duration
2016-05-31 18:39:28 +02:00
Timo Rothenpieler
971351b664
avcodec/nvenc: Handle minqp-only case in set_vbr
2016-05-31 17:00:07 +02:00
Timo Rothenpieler
eae4eba9cb
avcodec/nvenc: twopass mode works in all modes
2016-05-31 16:55:24 +02:00
Timo Rothenpieler
1330a0f31f
avcodec/nvenc: Fix forcing constqp rc mode
...
The CONSTQP enum value is 0, so this check failed for it.
2016-05-31 16:53:38 +02:00
Andrey Turkin
58c6dcb4b7
avcodec/nvenc: don't enqueue timestamps until a frame was accepted
...
Otherwise timestamps/pending FIFOs would go out of sync if nvEncodePicture ever fails.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 16:50:45 +02:00
Andrey Turkin
2f53b5b74b
avcodec/nvenc: refactor encode_frame a bit
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 16:47:07 +02:00
foo86
214e63f851
avcodec/dca_parser: skip initial padding
...
Padding before the first sync word can be very large for DTS-in-WAV
streams. There is no reason to include this padding in parsed packet.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-31 11:45:59 -03:00
foo86
1f7b67a1ca
avcodec/dca_parser: simplify state machine
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-31 11:45:55 -03:00
foo86
054a2c9fdf
avcodec/dca: support EXSS marker in avpriv_dca_convert_bitstream()
...
This is now required by dcadec_decode_frame(). All remaining users of
avpriv_dca_convert_bitstream() have been updated to expect EXSS marker.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-31 11:45:49 -03:00
foo86
d1f558b362
avcodec/dca: require checked bitstream reader
...
Remove half-working attempt at supporting unchecked bitstream reader by
always copying input data into intermediate buffer with large amount of
padding at the end.
Convert LBR decoder to checked bitstream reader. Convert
dcadec_decode_frame() to parse input data directly if possible.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-31 11:45:48 -03:00
Andrey Turkin
d3463912c1
avcodec/nvenc: extract timestamp calculations into separate function
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 16:32:03 +02:00
Andrey Turkin
0d021cc8b3
avcodec/nvenc: rework library load and GPU selection
...
Use explicit nvenc capability checks instead to determine usable devices
instead of SM versions.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 16:04:53 +02:00
Andrey Turkin
f052ef30ef
avcodec/nvenc: allow configuring number of surfaces
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 15:48:43 +02:00
Andrey Turkin
b69335304d
avcodec/nvenc: use INIT_CLEANUP to deal with init failures
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 15:48:43 +02:00
Andrey Turkin
f84dfbc74a
avcodec/nvenc: add rate control option
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 15:48:43 +02:00
Andrey Turkin
40df468ab1
avcodec/nvenc: convert tier to AVOptions
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 15:48:43 +02:00
Andrey Turkin
b0172873a8
avcodec/nvenc: convert levels to AVOptions
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 15:48:43 +02:00
Andrey Turkin
9824321b32
avcodec/nvenc: convert profile parsing to AVOptions
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 15:48:43 +02:00
Andrey Turkin
faffff88c2
avcodec/nvenc: use AVOptions to select presets
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 15:48:43 +02:00
Michael Niedermayer
e1de62c5be
doc: Add color_trc values
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-31 15:15:54 +02:00
Andrey Turkin
7aa16d59bf
avcodec/nvenc: split H264/HEVC encoder definitions into separate files
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-31 11:15:19 +00:00
Rostislav Pehlivanov
a1953d4cec
aacpsy: remove dead code
...
This code wasn't removed when the functionality was moved inside
aacenc.c with commit 8005b6de4f
Fixes CID1361962
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-05-31 01:08:25 +01:00
Marton Balint
0d0b9397d6
avformat/movenc: remove useless if and reindent
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-05-31 00:35:16 +02:00
Marton Balint
15005701b5
avformat/movenc: propagate shift_data errors properly
...
The second one is not explicitly needed, as res is not reset, but it is there
for consistency.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-05-31 00:35:16 +02:00
Marton Balint
37d201aad9
ffplay: simplify display code
...
And get rid of frame_queue_prev.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-05-31 00:33:50 +02:00
Michael Niedermayer
0b9b3163f2
avcodec/libxvid: Fix use of uninitialized AVPacket fields
...
Fixes CID1361964
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-31 00:24:22 +02:00
ZhouXiaoyong
2c7fd0e36b
avcodec/mips/h264qpel_mmi.c: Version 2 of the optimizations for loongson mmi
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
4. h264qpel use hepldsp optimizations
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-30 22:00:02 +02:00
Diego Biurrun
b2d5d6a7f2
build: Only enable symbol reduction if the compiler does proper DCE
...
With compilers that do not support proper dead code elimination, like
Sun C 5.12, linking fails due to missing references to unavailable,
but also unused, symbols.
Bug-Id: 895
2016-05-30 14:59:43 +02:00
Mark Reid
d74cc61574
libavformat/movenc: remove unnecessary null check
...
Fixes CID1361955
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-30 02:33:06 +02:00
Michael Niedermayer
645f7c1ce5
avfilter/f_loop: Fix leak on error
...
Fixes CID1355117
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 21:21:59 +02:00
Michael Niedermayer
be96ebdcd7
avfilter/vf_fieldhint: Reorder operation to prevent hypothetical integer overflow
...
Fixes CID1355110
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 19:00:15 +02:00
Diego Biurrun
c5fd4b5061
build: Simplify postprocessing of linker version script files
...
Generate the files in a single postprocessing step w/o intermediate files.
2016-05-29 16:49:16 +02:00
Diego Biurrun
535a742c26
build: Change structure of the linker version script templates
...
Split version files into one line per symbol/directive to allow compatibility
with the Solaris linker without preprocessing and eliminate $ from version file
templates to simplify the postprocessing shell command.
2016-05-29 16:43:11 +02:00
Diego Biurrun
5b1b495c8d
build: Print a message when generating version scripts
2016-05-29 15:09:05 +02:00
Michael Niedermayer
7ae4d574e8
avfilter/vf_fieldhint: Assert that mode is valid
...
Its checked by the AVOption code
Fixes CID1355122
Fixes CID1355121
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 14:49:27 +02:00
Michael Niedermayer
52ca24bdd2
avutil/softfloat: Improve doxy for av_sub_sf() and av_sf2int()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 14:45:07 +02:00
Michael Niedermayer
cbd19881f7
avformat/udp: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 12:35:14 +02:00
Michael Niedermayer
dac030d3aa
avformat/movenc: Fix potential track width/height overflows
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 04:42:04 +02:00
Michael Niedermayer
17d320800b
avformat/movenc: Avoid integer overflow
...
Fixes: CID1361947
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 03:56:23 +02:00
Thomas Guilbert
1a82d2cf8f
avformat/oggparseopus: Fix Undefined behavior in oggparseopus.c and libavformat/utils.c
...
Fixes: usan_granule_overflow
constant type fix by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 00:58:15 +02:00
Michael Niedermayer
c1ed78a591
avformat/utils: avoid overflow in compute_chapters_end() with huge durations
...
Fixes: usan_granule_overflow
Found-by: Thomas Guilbert <tguilbert@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 00:25:21 +02:00
Michael Niedermayer
2be3007ed5
avformat/utils: avoid overflow in update_stream_timings() with huge durations
...
Fixes: usan_granule_overflow
Found-by: Thomas Guilbert <tguilbert@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-29 00:14:02 +02:00
Petru Rares Sincraian
af56d0dffa
fate: add aemphasis test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-28 22:09:17 +02:00
Diego Biurrun
1e9c5bf4c1
asm: FF_-prefix internal macros used in inline assembly
...
These warnings conflict with system macros on Solaris, producing
truckloads of warnings about macro redefinition.
2016-05-28 19:18:26 +02:00
Diego Biurrun
dc40a70c57
Drop unnecessary libavutil/x86/asm.h #includes
2016-05-28 19:18:26 +02:00
Michael Niedermayer
d1520a6cfd
avutil/softfloat: Document public constants and a few public functions
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-28 14:24:20 +02:00
Carl Eugen Hoyos
a64a030ba0
lavf/mov: Support one more Avid compression id for AVCI50.
...
Reported by forum user lexidata.
2016-05-28 11:57:37 +02:00
Michael Niedermayer
86d703fd55
avformat/movenc: Fix memleak of reshuffled packet
...
Fixes CID1361952
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-28 03:13:14 +02:00
Michael Niedermayer
5db111757c
avformat/movenc: Rename reshuffles return variable to ensure it is not mixed up
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-28 02:55:33 +02:00
Michael Niedermayer
f66ca036bc
avformat/oggparseflac: Fix memleaks in old_flac_header()
...
Fixes CID1361953
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-28 01:22:01 +02:00
Michael Niedermayer
9106cba22a
fate: Add fate-prores-gray
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-27 18:27:52 +02:00
Håvard Espeland
9c43703620
avcodec/proresdec2: Add support for grayscale videos
...
Signed-off-by: Håvard Espeland <espeland@mixedrealities.no >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-27 17:25:40 +02:00
Michael Niedermayer
281caece46
avfilter/avfiltergraph: Clear graph pointers in ff_filter_graph_remove_filter()
...
When a filter is no longer part of a graph, its pointers should be cleared
so no stale pointers remain.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-27 16:30:25 +02:00
Luca Barbato
5264e7ba21
ac3: Check the array bound before dereferencing
...
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-05-27 15:49:48 +02:00
Hendrik Leppkes
2dc954e0bd
Merge commit '44d16df413878588659dd8901bba016b5a869fd1'
...
* commit '44d16df413878588659dd8901bba016b5a869fd1':
h264_parser: eliminate H264SliceContext usage
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-05-27 14:28:21 +02:00
Mark Thompson
a86aa16088
vaapi_h264: Add trivial support for low-power encoding
...
Experimental; requires Skylake and VAAPI 0.39.1 (not yet released).
Also increases the allowed range of the quality option - in low-power
mode, the Intel driver supports levels 1-8 (and 0 meaning default).
2016-05-27 10:57:00 +01:00
Mark Thompson
b51c7c6b8a
vaapi_h264: Fix frame_num after non-reference frames
...
Non-reference frames (nal_ref_idc == 0) should be discardable, so
frame_num does not advance after them. Before this change, a stream
containing unreferenced B-frames would be rejected by the reference
decoder.
2016-05-27 10:56:55 +01:00
Mark Thompson
2bfa067d0b
vaapi_encode: Check config attributes before creating config
...
This prevents attempts to use unsupported modes, such as low-power
H.264 mode on non-Skylake targets. Also fixes a crash on invalid
configuration, when trying to destroy an invalid VA config/context.
2016-05-27 10:56:45 +01:00
Diego Biurrun
6641819fee
build: Ignore generated mapfile and remove it on distclean
2016-05-27 11:27:24 +02:00
Gregor Riepl
d970f7ba31
ffserver: fixed deallocation bug in build_feed_streams
...
Signed-off-by: Gregor Riepl <onitake@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-27 00:22:06 +02:00
Michael Niedermayer
7f5c6ea511
avformat/utils: Fix use of uninitialized variable
...
Fixes CID1361961
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-26 19:04:46 +02:00
foo86
a0f76b825c
avcodec/dca: move EXSS sampling frequency arrays to dca.c
...
Avoids unwanted parser dependency on dcadata.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-26 13:32:48 -03:00
Anton Khirnov
f5c4388419
FATE: drop the audio stream from the dxtory test
...
This is a video test and there are no audio packets in the sample
anyway.
2016-05-26 15:40:34 +02:00
Anton Khirnov
fe7b21c8f1
avconv: fix parsing bitstream filters
...
The current code modifies the user-supplied string, which is shared for
the whole output file. So a bitstream filter specification applied to
multiple streams would not work correctly.
2016-05-26 15:40:34 +02:00
Anton Khirnov
80fb19bc23
avconv: fix a check for av_bsf_get_by_name() return value
2016-05-26 15:40:34 +02:00
Anton Khirnov
9f7590f4e4
avconv_vaapi: use the hwcontext device creation API
2016-05-26 15:40:34 +02:00
Anton Khirnov
18c506e9e6
avconv_dxva2: use the hwcontext device creation API
2016-05-26 15:40:34 +02:00
Anton Khirnov
f72db3f2f3
avconv_vdpau: use the hwcontext device creation API
2016-05-26 15:40:34 +02:00
Anton Khirnov
b8bf9194af
hwcontext_vaapi: implement device creation
2016-05-26 15:40:34 +02:00
Anton Khirnov
8e70385a8e
hwcontext_dxva2: implement device creation
2016-05-26 15:40:33 +02:00
Anton Khirnov
2e219b491b
hwcontext_cuda: implement device creation
2016-05-26 15:40:33 +02:00
Anton Khirnov
38392b2af8
hwcontext_vdpau: implement device creation
2016-05-26 15:40:33 +02:00
Anton Khirnov
1c9e8616c5
hwcontext: add a function for opening devices
2016-05-26 15:40:32 +02:00
Andrey Turkin
24b5cff01b
lavc: handle hw_frames_ctx where necessary
...
avcodec_copy_context() didn't handle hw_frames_ctx references correctly
which could cause crashes.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-26 15:40:05 +02:00
Paul B Mahol
d93495c954
avcodec/vble: add frame threading support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-26 12:22:45 +02:00
Michael Niedermayer
89e9393022
doc/developer.texi: Add a code of conduct
...
See: [FFmpeg-devel] [Vote] Code of Conduct
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-26 01:51:34 +02:00
Muhammad Faiz
defab0825f
avfilter/src_movie: add various commands
...
add seek command
add get_duration command
Update to codecpar by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-25 17:19:41 +02:00
Matthieu Bouron
d14deeb6bc
lavc/mediacodec: add missing MediaCodec.Get{Input,Output}Buffer() checks
2016-05-25 16:46:47 +02:00
Matthieu Bouron
fbc9359d85
lavc/mediacodec: factorize static fields initialization
2016-05-25 16:46:47 +02:00
Diego Biurrun
4024b566d6
golomb: Give svq3_get_se_golomb()/svq3_get_ue_golomb() better names
2016-05-25 16:37:43 +02:00
James Almer
493db04c4e
avcodec/Makefile: add missing dependencies to dca parser
...
They are needed starting with the previous commit
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-25 11:23:48 -03:00
foo86
cb55c5b49e
avcodec/dca_parser: set duration for core-less streams
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-25 11:23:45 -03:00
foo86
72a9a7e9cb
avcodec/dca_exss: prepare to be called from parser context
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-25 11:22:55 -03:00
Diego Biurrun
7ca4fdc046
fate: More fine-grained dependencies for demuxer tests
2016-05-25 15:16:38 +02:00
Diego Biurrun
07377fb557
fate: More fine-grained dependencies for voice codec tests
2016-05-25 15:16:25 +02:00
Timo Rothenpieler
24fcb23351
avcodec/nvenc: Require Maxwell for lossless
2016-05-25 12:16:54 +02:00
Andrey Turkin
a8cf25dd92
avcodec/nvenc: CUDA frames support
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-25 12:16:48 +02:00
Andrey Turkin
cfb49fc6f7
avcodec/nvenc: replace custom FIFOs with AVFifos
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-25 12:16:45 +02:00
Andrey Turkin
e1691c44f0
avcodec/nvenc: combine input and output surface structures
...
There is no point in separate structures as they have 1:1 relationship,
they are always used together and they have same lifetime.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-25 12:16:40 +02:00
Andrey Turkin
82d705e245
avcodec/nvenc: split large functions into smaller ones
...
Functions names and scopes are from libav. This commit basically moves
code around without changing it; it shouldn't change any functionality
except some small leak fixes on error paths.
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-05-25 12:16:33 +02:00
Martin Storsjö
3fdffc032e
rtsp: Use avcodec_descriptor_get instead of avcodec_find_decoder
...
This is only used for logging a human readable codec name for
debugging.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-25 12:22:28 +03:00
Michael Niedermayer
9591ca704b
avformat/udp: Close the socket after destroying the thread using the socket
...
for send() this cannot work and even for recv() it feels very wrong and hackish
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-25 01:39:23 +02:00
Michael Niedermayer
9b7a8bddac
avformat/udp: redesign threaded udp tx code
...
This fixes partially completed send()
Avoids holding the mutex during send()
fixes race conditions in error handling
removes copied non thread specific blocking code
Fixes deadlocks on closure
Fixes data loss on closure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-25 01:39:23 +02:00
Pavel Nikiforov
413c842a69
avformat/udp: Add a delay between packets for streaming to clients with short buffer
...
This commit enables sending UDP packets in a background thread with specified delay.
When sending packets without a delay some devices with small RX buffer
( MAG200 STB, for example) will drop tail packets in bursts causing
decoding errors.
To use it specify "fifo_size" with "packet_gap" .
The output url will looks like udp://xxx:yyy?fifo_size=<output fifo
size>&packet_gap=<delay in usecs>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-25 01:39:22 +02:00
dsmudhar
49640ae315
libavcodec/dv_tablegen: fixed wrong printf format
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-24 20:47:03 +02:00
dsmudhar
04d35004c3
libavfilter/vf_hwdownload: show error when ff_formats_ref fails
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-24 20:00:17 +02:00
Michael Niedermayer
35b37591c0
avfilter/af_hdcd: Replace complexer expression by litteral constant
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-24 19:56:55 +02:00
Diego Biurrun
e47b8bbf0b
avcodec: Bump micro version after changing public JPEG 2000 defines
2016-05-24 15:47:15 +02:00
Francois Cartegnie
ad61da054b
jpeg2000: Fix profile define values
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-05-24 12:22:57 +02:00
Michael Niedermayer
4c82ccad2b
avformat/mov: Avoid "Unintended sign extension"
...
Fixes CID1361957
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-24 04:37:50 +02:00
ZhouXiaoyong
8392794c92
avcodec/mips/idctdsp_mmi: Version 2 of the optimizations for loongson mmi
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 23:42:05 +02:00
ZhouXiaoyong
377e5db3db
avcodec/mips/pixblockdsp_mmi: Version 2 of the optimizations for loongson mmi
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 23:42:04 +02:00
ZhouXiaoyong
05a546181f
avcodec/mips/blockdsp_mmi: Version 2 of the optimizations for loongson mmi
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 23:42:03 +02:00
foo86
9bd1d79584
avcodec/dca_exss: always update downmix flags
...
Fixes potential parsing failure when total number of channels indicated
by EXSS asset descriptor decreases mid-stream and stale embedded downmix
flags are referenced.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 22:54:44 +02:00
Paul B Mahol
5b8faaad6c
avfilter/vf_blend: fix incorrect Y variable when threading is used
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-23 21:49:15 +02:00
dsmudhar
6b852a3fd9
libavutil/opencl: fixed uninitialized var warning
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 11:28:03 +02:00
Anton Khirnov
ac84e618df
avfiltergraph: check the query_formats() return value
2016-05-23 06:46:18 +02:00
Anton Khirnov
2ef6dab0a7
lavc: document that avcodec_close() should not be used
...
We cannot deprecate it until the new parser API is in place, because of
the way libavformat works. But the majority of the users can already
simply replace it with avcodec_free_context(), which will simplify the
transition once it is finally deprecated.
2016-05-23 06:46:18 +02:00
Anton Khirnov
04fc8e24a0
lavc: deprecate avcodec_get_context_defaults3()
...
This function is supposed to "reset" a codec context to a clean state so
that it can be opened again. The only reason it exists is to allow using
AVStream.codec as a decoding context (after it was already
opened/used/closed by avformat_find_stream_info()). Since that behaviour
is now deprecated, there is no reason for this function to exist
anymore.
2016-05-23 06:46:17 +02:00
Anton Khirnov
5f30ac2779
lavc: deprecate avcodec_copy_context()
...
Since AVCodecContext contains a lot of complex state, copying a codec
context is not a well-defined operation. The purpose for which it is
typically used (which is well-defined) is copying the stream parameters
from one codec context to another. That is now possible with through the
AVCodecParameters API. Therefore, there is no reason for
avcodec_copy_context() to exist.
2016-05-23 06:46:17 +02:00
Anton Khirnov
14634429b9
lavf: update muxing doxy
...
Describe the new AVCodecParameters API.
2016-05-23 06:46:17 +02:00
dsmudhar
84417593b9
libavcodec/cfhd: fixed wrong printf format
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 05:39:37 +02:00
dsmudhar
5836a5037e
libavfilter/af_hdcd: fixed negative signed value shift
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 05:39:37 +02:00
Petru Rares Sincraian
89806e0b9a
fate: add aecho test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-23 02:31:03 +02:00
Paul B Mahol
cd506c2792
avcodec/truemotion2rt: also export key frame info
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-22 23:32:38 +02:00
Luca Barbato
74b1bf632f
mp3: Make the extrasize explicit
...
Initialize the bit buffer with the correct size (amount of bits that will
be read) instead of relying on the bitstream reader overreading the
correct values.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-05-22 23:07:54 +02:00
Piotr Bandurski
854c405dab
avcodec/iff: mention RGB8/RGBN decoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-22 23:04:37 +02:00
Paul B Mahol
5ce1d089f0
avcodec/mvcdec: simplify, no need to use reget buffer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-22 22:58:01 +02:00
Diego Biurrun
52567e8198
get_bits: Drop some TRACE-level debug code
...
It will not be provided by the new bit reader anyway.
2016-05-22 20:22:43 +02:00
Diego Biurrun
e45a638f50
dump: Drop unused variable
2016-05-22 20:22:43 +02:00
Diego Biurrun
e2a3df1a46
avconv: Use more precise deprecation ifdefs
...
This fixes compilation with the libavcodec version bumped to 58.
2016-05-22 20:22:43 +02:00
Anton Khirnov
35c8580668
avconv: stop using AVStream.codec
...
It is now only used by the av_parser_change() call during streamcopy, so
allocate a special AVCodecContext instance for this case. This instance
should go away when the new parser API is finished.
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-05-22 20:22:42 +02:00
Michael Niedermayer
566be4f9e8
avformat/matroskaenc: reindent after last commit
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-22 03:22:16 +02:00
Michael Niedermayer
2062d51275
avformat/matroskaenc: wrap par->format use as sample format under codec_type == AVMEDIA_TYPE_AUDI
...
Fixes CID1361946
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-22 03:22:09 +02:00
Michael Niedermayer
9d5894b239
avformat/avienc: Fix memleaks on errors
...
Fixes CID1361951
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-22 02:14:33 +02:00
Michael Niedermayer
ea88dc3e8e
avformat/avienc: Rename reshuffles return variable to ensure it is not mixed up
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-22 02:14:33 +02:00
Paul B Mahol
defb960a47
avfilter/af_loudnorm: fix crash when ebur128 initialization was not successfull/complete
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-21 19:23:04 +02:00
Paul B Mahol
4da4bfcdc9
avformat: add MTAF demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-21 18:49:45 +02:00
Paul B Mahol
8c17eea46f
avcodec: add adpcm MTAF decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-21 18:49:45 +02:00
Michael Niedermayer
e7c5dbb4d1
avfilter/avf_ahistogram: raise minimum acmax to 1
...
If acmax can be 0 then it could result in a division by 0
Fixes CID1351345
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-21 18:47:25 +02:00
Paul B Mahol
8e069eb525
avcodec/aic: add frame threading support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-21 18:10:07 +02:00
Zhou Xiaoyong
c749be9eb3
avcodec/mips: loongson optimize h264pred with mmi v3
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. ff_pred16x16_plane_ functions only support N64 ABI now
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-21 17:13:13 +02:00
Zhou Xiaoyong
4a963ee698
avcodec/mips: loongson optimize hpeldsp with mmi v1
...
1.the codes are compatible with O32 ABI
2.use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-21 17:13:13 +02:00
Zhou Xiaoyong
a20646bb24
avcodec/mips/mpegvideo_mmi: Version 2 of the optimizations for loongson mmi
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-21 17:13:13 +02:00
Paul B Mahol
ccc3f4e710
avcodec/sgirledec: simplify, no need to use reget buffer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-21 15:49:03 +02:00
ZhouXiaoyong
a3eb5a3cdd
avcodec/mips/h264chroma_mmi: Version 2 of the optimizations for loongson mmi
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-21 14:25:33 +02:00
foo86
64fe1eebdd
avcodec/dca: use LUT for LBR frequency ranges
...
Values for unsupported frequencies > 48000 Hz are still included (parser
will make use of them).
Also convert sampling frequencies array to unsigned.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-20 23:12:37 -03:00
foo86
801dbf0269
avcodec/dca: simplify 'residual ok' flag tracking
...
Move this from separate structure field to a packet flag.
Behavior should be equivalent, except that residual flag is now properly
cleared when packet has no core frame at all.
Also print a message when forcing recovery mode due to invalid residual
to make debugging easier.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-20 22:54:48 -03:00
foo86
a0349ae27c
avcodec/dca_parser: improve frame end search
...
Parse core frame size directly when searching for frame end instead of
using value extracted from previous frame.
Account for unused bits when calculating sync word distance for 14-bit
streams to avoid alias sync detection.
Parse EXSS frame size and skip over EXSS frame to avoid alias sync
detection.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-20 16:36:08 -03:00
foo86
39f7620d76
avcodec/dca: don't set initial sample_fmt
...
Valid sample_fmt will be set by dcadec_decode_frame() based on stream type.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-20 15:11:34 -03:00
foo86
b5cda23039
avcodec/dca: remove useless debug message
...
Most DTS-in-WAV streams trigger this, making debug output hard to read.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-20 14:58:25 -03:00
Michael Niedermayer
b50bd69516
avutil/eval-test: Check av_expr_parse_and_eval() for failure and also check it in the fate test
...
Fixes CID1361940
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-20 19:32:02 +02:00
foo86
e0706e9cc8
avcodec/dca: remove Rice code length limit
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-20 14:11:49 -03:00
Paul B Mahol
8b5941ce59
doc/filters: fix order of tinterlace filter drop modes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-20 09:51:55 +02:00
Michael Niedermayer
b24fffeb94
avcodec/utils: Move avctx->codec check before its use
...
Fixes CID1361954
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-20 04:32:57 +02:00
Paul B Mahol
14992421df
avcodec/adpcm: pick correct step_index for IMA AMV
...
Fixes #5538
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-19 23:48:25 +02:00
Michael Niedermayer
699201ac0e
avcodec/options-test: Check avcodec_open2() return value
...
Fixes: CID1361937
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-19 21:19:00 +02:00
Stefano Sabatini
4b38df82c2
lavf/mpegts: add ID3 entry to the REGD_types array
...
This allows to recognize ID3 packets from their corresponding descriptor
tag.
2016-05-19 18:26:32 +02:00
Stefano Sabatini
1ab8e03a45
lavf/mpegtsenc: set metadata stream type and write descriptor for ID3 packets
...
This allow to remux data packets which are then recognized as ID3 packets.
2016-05-19 18:26:32 +02:00
Michael Niedermayer
7ecfe4dc36
avcodec/diracdec: Fix potential integer overflow
...
Fixes CID1361948
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-19 18:13:29 +02:00
Paul B Mahol
7494b49780
avformat/iff: parse DPAN chunk
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-19 17:02:06 +02:00
Paul B Mahol
a5c5ae5ed8
avcodec/iff: add support for ANBR files
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-19 16:52:30 +02:00
Anton Khirnov
3399a26d3f
nvenc: allow setting the number of slices
...
Based on a patch by Agatha Hu <ahu@nvidia.com >
2016-05-19 14:17:04 +02:00
Philip Langdale
10545f84b8
nvenc: De-compensate aspect ratio compensation of DVD-like content.
...
For reasons we are not privy to, nvidia decided that the nvenc encoder
should apply aspect ratio compensation to 'DVD like' content, assuming that
the content is not BT.601 compliant, but needs to be BT.601 compliant. In
this context, that means that they make the following, questionable,
assumptions:
1) If the input dimensions are 720x480 or 720x576, assume the content has
an active area of 704x480 or 704x576.
2) Assume that whatever the input sample aspect ratio is, it does not account
for the difference between 'physical' and 'active' dimensions.
From these assumptions, they then conclude that they can 'help', by adjusting
the sample aspect ratio by a factor of 45/44. And indeed, if you wanted to
display only the 704 wide active area with the same aspect ratio as the full
720 wide image - this would be the correct adjustment factor, but what if you
don't? And more importantly, what if you're used to lavc not making this kind
of adjustment at encode time - because none of the other encoders do this!
And, what if you had already accounted for BT.601 and your input had the
correct attributes? Well, it's going to apply the compensation anyway!
So, if you take some content, and feed it through nvenc repeatedly, it
will keep scaling the aspect ratio every time, stretching your video out
more and more and more.
So, clearly, regardless of whether you want to apply bt.601 aspect ratio
adjustments or not, this is not the way to do it. With any other lavc
encoder, you would do it as part of defining your input parameters or do
the adjustment at playback time, and there's no reason by nvenc should
be any different.
This change adds some logic to undo the compensation that nvenc would
otherwise do.
nvidia engineers have told us that they will work to make this
compensation mechanism optional in a future release of the nvenc
SDK. At that point, we can adapt accordingly.
Signed-off-by: Philip Langdale <philipl@overt.org >
Reviewed-by: Timo Rothenpieler <timo@rothenpieler.org >
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-19 14:17:04 +02:00
Anton Khirnov
9375c97460
nvenc: list the major contributors in the copyright header
2016-05-19 14:17:04 +02:00
Timo Rothenpieler
09522a303d
configure: Don't require nonfree for nvenc
...
As the nvEncodeApi.h header is now MIT licensed, this can be dropped.
The loaded CUDA and NVENC libraries are part of the nvidia driver, and
thus count as system libraries.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-19 14:17:03 +02:00
Anton Khirnov
6f58b4dc47
nvenc: drop the hard dependency on CUDA
...
The code needs only a few definitions from cuda.h, so define them
directly when CUDA is not enabled. CUDA is still required for accepting
HW frames as input.
Based on the code by Timo Rothenpieler <timo@rothenpieler.org >.
2016-05-19 14:17:03 +02:00
Anton Khirnov
f11ec8cee7
nvenc: only support HW frames when CUDA is enabled
...
hwcontext_cuda.h includes cuda.h, so this will allow building nvenc
without depending on cuda.h
2016-05-19 14:17:03 +02:00
Anton Khirnov
2156c4c300
nvenc: write the VUI signal properties for HEVC
...
Bump the API version requirement to 6.
Based on a patch by Agatha Hu <ahu@nvidia.com >.
2016-05-19 14:17:03 +02:00
Anton Khirnov
a1df786503
nvenc: only write the VUI signal type fields if they are set
...
Based on a patch by Agatha Hu <ahu@nvidia.com >.
2016-05-19 14:17:03 +02:00
Timo Rothenpieler
cea1fb854c
nvenc: Generate bufferingPeriod/pictureTiming SEI
...
For some unknown reason enabling these causes proper CBR padding,
so as there are no known downsides just always enable them in CBR mode.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-19 14:17:03 +02:00
Timo Rothenpieler
a1e215ea01
nvenc: Delay frame output to increase encoding speed
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-19 14:17:01 +02:00
Anton Khirnov
9427d92f40
nvenc: add support for lossless encoding
...
Based on a patch by Philip Langdale <philipl@overt.org >
2016-05-19 14:08:55 +02:00
Timo Rothenpieler
795329dd4c
nvenc: Generate AUD NAL units for better compatiblity
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-19 14:08:30 +02:00
Anton Khirnov
e42b9bc894
nvenc: fix the rc option definitions
2016-05-19 14:08:25 +02:00
Anton Khirnov
65dc7ca4c8
Add release notes for 12.
2016-05-19 13:44:41 +02:00
Derek Buitenhuis
d68fb14758
mjpegdec: Properly fail on malloc failure
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-19 13:44:41 +02:00
Anton Khirnov
85ce9636e4
configure: move the hardware accel libs' entries in the configure output
...
Print them as a subsection of the external library section, in line with
what is done for the help text in the previous commit.
2016-05-19 13:43:29 +02:00
Anton Khirnov
c0f4c7db9f
configure: move the hardware accel libs' entries in the help text
...
Group them in a subsection of the external library section. That should
make them easier to find and understand how they fit in the scheme of
things.
Also, rewrite the description text in a similar way as in the previous
commit.
2016-05-19 13:41:51 +02:00
Anton Khirnov
5e2203448a
configure: improve the help text for external libraries
...
Add a more accurate description of what the switches actually do (i.e.
allow using the given library, not enabling the corresponding
codecs etc.).
Replace the library descriptions, in many cases boilerplate text without
useful information, with a short summary of what the library does.
2016-05-19 13:40:53 +02:00
Anton Khirnov
0d95d88fbd
lavc: revert the Makefile part of 330177b
...
There is no real advantage to listing some codecs or subsystems
separately simply because they are somehow "hw-accelerated", on the
contrary it makes them harder to find than in a plain alphabetically
ordered list.
2016-05-19 13:40:53 +02:00
Diego Biurrun
ded4a6543d
xtea-test: Use struct allocation functions from the API
2016-05-19 09:55:55 +02:00
Diego Biurrun
8131bd4c22
blowfish-test: Use struct allocation functions from the API
2016-05-19 09:55:55 +02:00
Diego Biurrun
a86ef80494
blowfish-test: Return different values for different errors
2016-05-19 09:55:55 +02:00
Martin Storsjö
b84f3a4003
movenc: Write 'loci' geotag metadata for 3gp and mp4
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:55 +03:00
Martin Storsjö
f12a705ee5
movenc: Factorize a function for finding a metadata entry and the associated language
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:54 +03:00
Michael Niedermayer
daec1651f1
movenc: Write ?xyz geotag metadata for mov files
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:53 +03:00
Michael Niedermayer
bc43131997
mov: Also export loci altitude
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:53 +03:00
Michael Niedermayer
94d8141c8c
mov: Append place name instead of overwriting for loci
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:52 +03:00
Michael Niedermayer
f126365cda
mov: Fix parsing short loci
...
Previously, we required the minimum number of bytes required for
the full box. Don't strictly require the astronomical body and additional
notes fields, but do require an altitude field (which currently isn't
parsed). This matches the initial length check at the start of the function
(which doesn't know about the variable length place field).
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:51 +03:00
Michael Niedermayer
704d2bd18b
mov: Print reason of loci parsing failure
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:45 +03:00
Martin Storsjö
d34826c33d
mov: Add a comment referring to the standard that defines the loci box
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-19 10:46:39 +03:00
James Almer
e34e7a575e
avformat/dtshddec: move data_start outside of DTSHDDemuxContext
...
It's only used in dtshd_read_header()
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-19 00:02:50 -03:00
Michael Niedermayer
df01a29c1b
avcodec/exr: Fix potential integer overflow
...
Fixes CID1361949
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-19 03:28:25 +02:00
Michael Niedermayer
641dccc2aa
avcodec/h264: Check init_get_bits8() for failure
...
Fixes CID1361935
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-19 00:19:52 +02:00
Michael Niedermayer
4a81bddb4d
ffmpeg_filter: Fix AVBufferSrcParameters leak
...
Fixed: CID1361950
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-19 00:10:27 +02:00
Michael Niedermayer
d08f2c172f
avformat/avidec: Detect index with too short entries
...
Fixes Ticket5498
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-18 23:59:02 +02:00
Michael Niedermayer
7155bd1c94
avcodec/m101: Ask for samples with too small extradata_size
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-18 23:59:02 +02:00
Kyle Swanson
c0c378009b
avfilter: add loudnorm
...
Signed-off-by: Kyle Swanson <k@ylo.ph >
2016-05-18 22:15:01 +02:00
Martin Storsjö
72d621069f
movenc: Add a missed const
...
This was missed in e1eb0fc960 , when ff_interleaved_peek was
changed to include const during the evolution of the patch.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 21:59:48 +03:00
Michael Niedermayer
42ee137a0a
avcodec/m101: Check BPS value
...
Fixes null pointer dereference
Fixes Ticket5520
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-18 18:40:22 +02:00
Paul B Mahol
810a8ba5b6
avcodec/iff: add forgotten checks for end of input buffer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-18 12:46:43 +02:00
Paul B Mahol
eef2f64294
avcodec/iff: scala anim32 & anim16 decompression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-18 12:32:41 +02:00
Martin Storsjö
a79aafd0b4
movenc: Add a test for VFR with b-frames, with a duration change at a fragment end
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 10:37:05 +03:00
Martin Storsjö
e1eb0fc960
movenc: Use packets in interleaving queues for the duration at the end of fragments
...
As long as caller only writes packets using av_interleaved_write_frame
with no manual flushing, this should allow us to always have accurate
durations at the end of fragments, since there should be at least
one queued packet in each stream (except for the stream where the
current packet is being written, but if the muxer itself does the
cutting of fragments, it also has info about the next packet for that
stream).
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 10:37:03 +03:00
Martin Storsjö
fd4957d9c6
movenc-test: Test write_data_type
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 10:37:00 +03:00
Martin Storsjö
71852a1ba8
matroskaenc: Provide output bytestream markers
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 10:36:58 +03:00
Martin Storsjö
dbbaad32e3
movenc: Provide output bytestream markers for fragmented content
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 10:36:55 +03:00
Martin Storsjö
371df9ba71
flvenc: Provide output bytestream markers
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 10:36:53 +03:00
Martin Storsjö
db7968bff4
avio: Allow custom IO users to get labels for the output bytestream
...
This allows callers with avio write callbacks to get the bytestream
positions that correspond to keyframes, suitable for live streaming.
In the simplest form, a caller could expect that a header is written
to the bytestream during the avformat_write_header, and the data
output to the avio context during e.g. av_write_frame corresponds
exactly to the current packet passed in.
When combined with av_interleaved_write_frame, and with muxers that
do buffering (most muxers that do some sort of fragmenting or
clustering), the mapping from input data to bytestream positions
is nontrivial.
This allows callers to get directly information about what part
of the bytestream is what, without having to resort to assumptions
about the muxer behaviour.
One keyframe/fragment/block can still be split into multiple (if
they are larger than the aviocontext buffer), which would call
the callback with e.g. AVIO_DATA_MARKER_SYNC_POINT, followed by
AVIO_DATA_MARKER_UNKNOWN for the second time it is called with
the following data.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-18 10:36:45 +03:00
Michael Niedermayer
936751b652
avformat/avio: Fix null pointer dereference in case of memleak
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-18 00:53:21 +02:00
Yong Lei
7bacf74536
avformat/avio: fix memory leak in url_find_protocol
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-18 00:51:52 +02:00
Chris Cunningham
2875745d35
avformat/utils: Check negative bps before shifting in ff_get_pcm_codec_id()
...
Fixes: undefined shift.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-17 23:47:24 +02:00
Vittorio Giovara
8e757716c6
avprobe: Print stereo3d information
2016-05-17 12:25:27 -04:00
Vittorio Giovara
0c4468dc18
stereo3d: Add API to get name from value or value from name
...
Use it in av_dump_format() instead of a huge switch case.
2016-05-17 12:25:27 -04:00
Vladimir Voroshilov
d621b2f795
lavf: Raw G.729 demuxer
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-05-17 12:24:32 -04:00
Derek Buitenhuis
d55568d22a
Merge commit '71d3305c2711d4f6ec8b92db09ff64cf4e19a58e'
...
* commit '71d3305c2711d4f6ec8b92db09ff64cf4e19a58e':
h264_parse: make sure the ref count is zeroed on all failure paths
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-17 15:18:43 +01:00
Derek Buitenhuis
278dcec28d
Merge commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa'
...
* commit 'a6e27f7add2698fdd89911632b570c3d0c3f2aaa':
h264: factor out parsing the reference count into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-17 15:16:38 +01:00
Derek Buitenhuis
6b295bccbb
Merge commit '56b17a33f231859cbccbd741b4763617cb4ecf03'
...
* commit '56b17a33f231859cbccbd741b4763617cb4ecf03':
h264: stop testing whether the reference count changes in ff_set_ref_count()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-17 14:55:36 +01:00
Derek Buitenhuis
7ab2c036b9
Merge commit 'e9f884416c76558098fc1f63825b293956e8483c'
...
* commit 'e9f884416c76558098fc1f63825b293956e8483c':
h264: move reading direct_spatial_mv_pred out of ff_set_ref_count()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-17 14:38:14 +01:00
Hendrik Leppkes
15ad023210
Merge commit '8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6'
...
* commit '8d0cc8ca97678f4ca87948ebabcbaab5a4f4c1f6':
h264_parser: switch to h2645_parse for NAL unescaping
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-05-17 14:21:12 +02:00
Hendrik Leppkes
a9bb4cf87d
h2645_parse: support badly muxed mp4 streams
...
Some streams contain an additional AnnexB NAL inside the mp4/nalff NALU.
This commonly occurs in interlaced streams where both fields are packed
into the same MP4 NAL with an AnnexB startcode in between.
Port handling of this format from the previous h264 nal handling.
Fixes trac #5529
2016-05-17 14:03:21 +02:00
Martin Storsjö
34effe816f
fate: Update fate-lavf-ts after commit 393596f9d5
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-17 12:41:38 +03:00
Diego Biurrun
b8de14bcdf
tools: Port to codec parameters API
2016-05-17 11:16:26 +02:00
Paul B Mahol
95b20ad7b2
avcodec/iff: fix artifacts with uncompressed ham ANIMs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-17 11:02:44 +02:00
Francois Cartegnie
393596f9d5
mpegtsenc: stop impersonating ses in sdt
...
Unless specified, users must use non registered
range for network id
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-05-17 10:29:36 +02:00
Alexandra Hájková
ffa190d047
Move VLC and RL_VLC_ELEM structure definitions to a separate header
...
Use the newly created vlc.h directly instead of including get_bits when needed.
The VLC and RL_VLC_ELEM structures are independent from the bitreader.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-05-17 10:29:27 +02:00
Anton Khirnov
b23613268c
avconv_dxva2: use the hwcontext API
2016-05-17 09:11:34 +02:00
Anton Khirnov
c46db38cde
hwcontext: add a dxva2 implementation
2016-05-17 09:11:25 +02:00
ZhouXiaoyong
af3e944e7e
avcodec/mips/h264dsp_mmi: Version 2 of the optimizations for loongson mmi
...
1. no longer use the register names directly and optimized code format
2. to be compatible with O32, specify type of address variable with mips_reg and handle the address variable with PTR_ operator
3. optimize some unaligned loads and stores
4. use uld and mtc1 to workaround cpu 3A2000 gslwlc1 bug (gslwlc1 instruction extension bug in O32 ABI)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-17 04:18:42 +02:00
James Almer
60c2e38dcb
avformat/dtshddec: implement AUPR_HDR chunk parsing
...
Use it to get stream duration, sample rate, channel count and initial padding
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-16 19:29:59 -03:00
James Almer
ab3c04c458
avformat/dtshddec: parse chunks stored after audio data
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-16 19:29:55 -03:00
Paul B Mahol
72e33eec3a
avcodec/iff: add support for ANIMs with keyframes and concatenated ANIMs
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-16 22:39:03 +02:00
Paul B Mahol
8767470fb5
avcodec/iff: check if there is enough bytes left
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-16 15:39:28 +02:00
Michael Niedermayer
635b2ec5f2
avformat/utils: Do not compute the bitrate from duration == 0
...
Fixes division by 0 in fate-acodec-ra144
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-16 14:23:49 +02:00
Michael Niedermayer
6085d6b2ae
ffmpeg: Check that r_frame_rate is set before attempting to use it
...
Avoids unexpected occurance and dependency on NaN behavior and divisions by 0
Testcase: fate-lavf-fate-avi_cram
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-16 14:23:49 +02:00
Alexandra Hájková
d338abb664
mpeg4videodec: Call av_log() in check_marker() with AVCodecContext instead of NULL
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-16 10:51:17 +02:00
Alexandra Hájková
e4b38878da
Move check_marker() from get_bits to mpeg4videodec
...
MPEG-4 is the only decoder which uses check_marker().
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-16 10:51:01 +02:00
Anton Khirnov
31f6a4b4b8
lavc: mark the old audio/video encoding API as deprecated
2016-05-16 10:31:26 +02:00
Anton Mitrofanov
2fb1d17a5a
x86inc: Enable AVX emulation in additional cases
...
Allows emulation to work when dst is equal to src2 as long as the
instruction is commutative, e.g. `addps m0, m1, m0`.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-16 10:31:24 +02:00
Anton Mitrofanov
300fb0df84
x86inc: Improve handling of %ifid with multi-token parameters
...
The yasm/nasm preprocessor only checks the first token, which means that
parameters such as `dword [rax]` are treated as identifiers, which is
generally not what we want.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-16 10:31:20 +02:00
Anton Mitrofanov
8d02579fae
x86inc: Fix AVX emulation of some instructions
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-16 10:31:17 +02:00
Henrik Gramner
ba3eb745cc
x86inc: Fix AVX emulation of scalar float instructions
...
Those instructions are not commutative since they only change the first
element in the vector and leave the rest unmodified.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-05-16 10:31:13 +02:00
Anton Khirnov
8996515b13
avpacket: fix setting AVPacket.data in av_packet_ref()
...
The data field does not necessarily point to the beginning of the
underlying AVBuffer.
CC: libav-stable@libav.org
2016-05-16 10:31:08 +02:00
Anton Khirnov
e62ff72fc1
lavc: make avcodec_open2() fail when the timebase is not set for encoding
...
Many encoders use it. There is also a divide by the timebase lower in
this function, which would crash when it is not set.
2016-05-16 10:30:57 +02:00
Michael Niedermayer
feeb3a9261
swresample/resample: Fix division by 0 with tap_count=1
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-16 05:10:21 +02:00
Michael Niedermayer
2f76157eb0
swresample/rematrix: Use clipping s16 rematrixing if overflows are possible
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-15 22:25:34 +02:00
Paul B Mahol
5afecff1ef
avformat/adxdec: set bit_rate, fixes duration calculation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-15 19:05:19 +02:00
Michael Niedermayer
7fe81bc4f8
swresample/rematrix: Use error diffusion to avoid error in the DC component of the matrix
...
This fixes the sum of the integer coefficients ending up summing to a value
larger than the value representing unity.
This issue occurs with qN0.dts when converting to stereo
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-15 18:36:53 +02:00
Michael Niedermayer
35c23bf67d
avcodec/dsd: Fix "warning: ctables defined but not used [-Wunused-variable]"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-15 17:46:38 +02:00
Paul B Mahol
5350e0fc97
avcodec/iff: rewrite out of bounds checking in writer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-15 16:35:47 +02:00
Michael Niedermayer
fd4a52e4da
avcodec/dstdec: Fix "warning: initialization from incompatible pointer type [enabled by default]"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-15 12:21:15 +02:00
James Almer
81c3ce0855
doc/general: update supported DCA extensions
2016-05-14 23:00:12 -03:00
Will Kelleher
964f07f68e
hevc: Fix memory leak related to a53_caption data
...
Signed-off-by: Will Kelleher <wkelleher@gogoair.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-15 01:30:53 +02:00
Paul B Mahol
6543a72fce
doc/general: mention DST decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-15 01:26:02 +02:00
Paul B Mahol
9b017ac7f1
doc/general: mention WSD demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-15 01:22:36 +02:00
Paul B Mahol
26eee872e8
avcodec/escape124: change transitions table type to int8_t
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-15 01:19:49 +02:00
Paul B Mahol
f57897e498
avcodec: bump minor and update Changelog for recent DST addition
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-15 01:19:49 +02:00
Peter Ross
86e493a6ff
avcodec: add Direct Stream Transfer (DST) decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-15 01:01:45 +02:00
foo86
365b0c13e4
avcodec/dca: print error message when no frame is found in packet
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-14 19:59:49 +02:00
Paul B Mahol
51a1c1c6ac
avcodec/iff: check for end of buffer in input for delta_l decompression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-14 14:29:59 +02:00
ZhouXiaoyong
d680ab1c46
avutil/mips: header asmdefs.h add some PTR_ macros for loongson
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-14 04:46:52 +02:00
James Almer
004b582386
avutil/lzo: split test out into a separate file
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-13 22:48:56 -03:00
Paul B Mahol
01ead2a639
avcodec/iff: implement 3rd delta ANIM decompression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-13 23:28:19 +02:00
James Almer
8ba257bac6
avformat/Makefile: fix avlanguage dependencies
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-13 17:19:56 -03:00
James Almer
d8ef8b960a
avutil/sha512-test: fix memleak
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-13 16:53:44 -03:00
James Almer
7ee0e0ca1d
avutil/sha-test: fix memleak
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-13 16:53:26 -03:00
James Almer
64dbfcc415
avutil/ripemd-test: fix memleak
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-13 16:53:18 -03:00
James Almer
f92d2f3292
avutil/aes-test: fix memleak
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-13 16:53:08 -03:00
Matthieu Bouron
f6265a5cbc
swresample/arm: add ff_resample_common_apply_filter_{x4,x8}_{float,s16}_neon
2016-05-13 21:13:46 +02:00
Diego Biurrun
11de006bab
Combine deprecation guards where appropriate
...
Some code blocks use multiple bits of deprecated API.
2016-05-13 15:14:30 +02:00
Diego Biurrun
a6a750c7ef
tests: Move all test programs to a subdirectory
2016-05-13 14:55:56 +02:00
Diego Biurrun
257f00ec1a
Split global .gitignore file into per-directory files
2016-05-13 14:55:56 +02:00
Paul B Mahol
17ea1cd559
avcodec/iff: change delta l offset to uint32_t
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-13 14:02:59 +02:00
Andriy Lysnevych
ed3a02547c
avcodec/avpacket: Respect payload offset in av_packet_ref
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-13 03:49:26 +02:00
Tobias Rapp
77d1e88cf5
avformat/dump.c: fix mixed log levels
...
Previously a partial log message without newline was printed in case of
loglevel=warning.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-13 03:49:26 +02:00
Paul B Mahol
cb928fc448
lavc: add IFF ANIM decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-13 00:24:48 +02:00
Derek Buitenhuis
97946b20b6
Merge commit 'f3ed484953b81856e40239d2410058a96188b2be'
...
* commit 'f3ed484953b81856e40239d2410058a96188b2be':
h264_mp4toannexb_bsf: do not fail on annex B extradata
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:34:03 +01:00
Luca Barbato
dd4fb2339f
ape: Unbreak adaptcoeffs computation
...
And simplify and explain the expression.
Fault introduced in f3fdef108e
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:32:16 +01:00
Derek Buitenhuis
5b9a4476e3
Merge commit '5fca95c8e515a5ae542d9626ec088bdfc658450e'
...
* commit '5fca95c8e515a5ae542d9626ec088bdfc658450e':
libx264: Forbid inverted Stereo3D mode
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:29:34 +01:00
Derek Buitenhuis
e3cfd1b275
Merge commit '9e2af0e9071a1229cfe21efff394691d91f979b2'
...
* commit '9e2af0e9071a1229cfe21efff394691d91f979b2':
libx264: Allow Stereo3D monoscopic value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:29:09 +01:00
Derek Buitenhuis
d4acf9f2dd
Merge commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6'
...
* commit 'a08b5d7b5725932f4ad39e95c5d6589392dee2c6':
build: Silence the lcov-reset target
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:28:23 +01:00
Derek Buitenhuis
1549ca4267
Merge commit '75b90ef722b7cdfc70118ab987e298d087aae693'
...
* commit '75b90ef722b7cdfc70118ab987e298d087aae693':
libavformat: Update the comment about AVOutputFormat flags
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:27:54 +01:00
Derek Buitenhuis
ee96b7b1c6
Merge commit '74383def8f46805faf3391c98516b248108a9a6b'
...
* commit '74383def8f46805faf3391c98516b248108a9a6b':
movenc: Handle pts == NOPTS when autoflushing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:27:34 +01:00
Derek Buitenhuis
a022c1fe76
Merge commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da'
...
* commit '0abb07bad7026a945a31ba4047e6583c8b3fa3da':
movenc: Update a comment to reflect how the code actually behaves
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:27:01 +01:00
Derek Buitenhuis
a2906846da
Merge commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89'
...
This commit is purposely skipped because it doesn't work very well
with what our img2enc.c supports.
* commit '79fdbfdb3e50f3f906903e027714ee04c1a00e89':
img2enc: Refactor the atomic renaming code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:26:19 +01:00
Derek Buitenhuis
22900770c5
Merge commit 'f3fdef108eb06b1e71b29152bf6822519e787efe'
...
* commit 'f3fdef108eb06b1e71b29152bf6822519e787efe':
ape: Avoid undefined behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:20:51 +01:00
Derek Buitenhuis
3fd5f09845
Merge commit '6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5'
...
This commit is a no-op.
* commit '6b2ad3ca48a6638cb0226ed5aab41d435d8c83a5':
indeo3: Avoid undefined behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:18:49 +01:00
Derek Buitenhuis
f8a4b8bc40
Merge commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f'
...
* commit 'eae2ebded3b801ed55d32746b98db88ffe196f4f':
libxvid: Create extradata in init using a dummy frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:18:02 +01:00
Derek Buitenhuis
92d934106c
Merge commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b'
...
* commit '785bfb1d7bb8de567c3aac1d9cc369b55ac9fb7b':
pixfmt: fix wrong comment
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:17:13 +01:00
Derek Buitenhuis
9f8a942d6a
Merge commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477'
...
* commit '06edef3d5e072ef3c4face9ce946d2d9c36cc477':
Generate the lists of enabled protocols/bsfs from configure.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-12 14:04:02 +01:00
Carl Eugen Hoyos
d1cacbbea9
lavc/libutvideoenc: Cast an unsigned constant to int.
...
Fixes the following warning / error:
libavcodec/libutvideoenc.cpp:281:1: warning: narrowing conversion of ‘3221258240u’ from ‘unsigned int’ to ‘int’ inside { } is ill-formed in C++11 [-Wnarrowing]
Fixes ticket #5542 .
2016-05-12 09:07:02 +02:00
James Almer
cd244fae98
avutil/cpu-test: Fix includes (needed for HAVE_*)
...
Commit message by commiter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-12 03:48:32 +02:00
Michael Niedermayer
65ffc0b1ed
avutil/float_dsp-test: Add include config.h for HAVE_*
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-12 03:48:32 +02:00
James Almer
7d8e19a5c4
avutil: make crypto testprogs include headers only
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-11 19:47:35 -03:00
Derek Buitenhuis
f693184557
Split drawutils test out into separate file
...
This was missed during 96d616052b because
it is not included in FATE.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 20:43:19 +01:00
Derek Buitenhuis
64fbf2f03e
avfft-test: Add missing mem.h include
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 20:42:55 +01:00
Christophe Gisquet
9ca16bdd3f
lossless audio dsp: unroll
...
The loops are guaranteed to be at least multiples of 8, so this
unrolling is safe but allows exploiting execution ports.
For int32 version: 68 -> 58c.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-11 21:03:07 +02:00
Michael Niedermayer
bf29794022
avcodec/dca_lbr: Fix "warning: missing braces around initializer"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-11 21:03:07 +02:00
Derek Buitenhuis
c71c3b9ff4
Merge commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5'
...
* commit 'a0f469da744db83db32f3fe13186ee4aa2bc7dc5':
hwcontext: initialize sw_format in av_hwframe_ctx_alloc()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:46:17 +01:00
Derek Buitenhuis
ed8bacfb5c
Merge commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a'
...
* commit '5e1a3ea3ba7bb0c71d931e93e60fb75f51b0cc1a':
lavc: move the vaapi encoders further down in the list of codecs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:45:20 +01:00
Derek Buitenhuis
8ed427f9f9
Merge commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12'
...
These are all trivial to merge.
* commit '92fdea37477b5a2d1329e5ef0773e24473fa8f12':
vaapi_h265: Add -qp option, use it to replace use of -global_quality
vaapi_h265: Add constant-bitrate encode support
vaapi_h264: Add encode quality option (for quality-speed tradeoff)
vaapi_h264: Add -qp option, use it to replace use of -global_quality
vaapi_encode: Add support for codec-local options
vaapi_h264: Add constant-bitrate encode support
vaapi_encode: Refactor slightly to allow easier setting of global options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:40:39 +01:00
Derek Buitenhuis
bc3d2f2578
Merge commit '18019f8cb9663dd1032c65aa453eaec18d641905'
...
* commit '18019f8cb9663dd1032c65aa453eaec18d641905':
FATE: add an H.264 test with unescaped extradata
FATE: add an H.264 test with invalid reference lists
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:39:09 +01:00
Derek Buitenhuis
75a1fc0376
Merge commit '9d4d9be538faa537440fff37d3b7ecf322911a55'
...
* commit '9d4d9be538faa537440fff37d3b7ecf322911a55':
libavcodec: Document that encoders may use the framerate field in AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:26:22 +01:00
Derek Buitenhuis
ec1d8abfb9
Merge commit '1bb56abb9b37bd208a66164339c92cad59b1087b'
...
* commit '1bb56abb9b37bd208a66164339c92cad59b1087b':
omx: Add support for zerocopy input of frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:24:26 +01:00
Derek Buitenhuis
e330ab0fb7
Merge commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658'
...
* commit 'f1cd9b03f3fa875eb5e394281b4b688cec611658':
omx: Add support for broadcom OMX on raspberry pi
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:23:15 +01:00
Derek Buitenhuis
0e38723220
Merge commit 'e8919ec486a5559fdcf366e347be0656d904a87f'
...
* commit 'e8919ec486a5559fdcf366e347be0656d904a87f':
libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:19:28 +01:00
Derek Buitenhuis
f4c88eef95
Merge commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf'
...
* commit 'b8e899f4bf5f09900aa71552112d32a5566b6baf':
mmaldec: Use imgutils.h for copying frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:15:14 +01:00
Derek Buitenhuis
4f173d055c
Merge commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f'
...
* commit '798845ce7e5b7fdd17c7269c5d267fb487d9c46f':
testprogs: Add missing libm.h includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:14:36 +01:00
Derek Buitenhuis
96d616052b
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
...
* commit 'd12b5b2f135aade4099f4b26b0fe678656158c13':
build: Split test programs off into separate files
Some conversions done by: James Almer <jamrial@gmail.com >
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 19:13:03 +01:00
Hendrik Leppkes
27506aceda
avcodec/dca_lbr: explicitly initialize structs with zero
...
This fixes build on MSVC and conforms to the usual init style used.
2016-05-11 16:34:57 +02:00
Derek Buitenhuis
ce3037ac8e
Merge commit '330177b508420a553083df94f22cbd5142de0f4a'
...
* commit '330177b508420a553083df94f22cbd5142de0f4a':
build: Group declarations for hw-accelerated de-/encoding separately
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-11 15:19:06 +01:00
Timo Rothenpieler
c921ca9b5d
avcodec/nvenc: Write buffPeriod/picTime SEI in both CBR modes
2016-05-11 12:58:52 +02:00
Diego Biurrun
763d69bfb2
Add some more deprecation guards
...
Avoids unused function/label/variable warnings after the next version bump.
2016-05-11 12:22:49 +02:00
Diego Biurrun
b7e64fba7f
Reduce the scope of some variables
...
This avoids unused variable warnings after the next version bump.
Also drop a trace level av_log() call that is in the way.
2016-05-11 12:21:25 +02:00
Timo Rothenpieler
3a9df7dfec
avcodec/nvenc: Generate bufferingPeriod/pictureTiming SEI
...
For some unknown reason enabling these causes propper CBR padding,
so as there are no known downsides just always enable them in CBR mode.
2016-05-11 10:34:31 +02:00
Martin Storsjö
bc2a32969e
rtsp: Parse SSRC attributes in the SDP
...
When feeding input RTP packets to the depacketizer via custom IO,
it needs to pick the right stream using the payload type for
RTP packets, and using the SSRC for RTCP packets. If the first
packet is an RTCP packet, we don't (currently) know the SSRC
yet and thus can't pick the right RTP depacketizer to handle it.
By parsing the SSRC attribute in the SDP, we can map initial
RTCP packets to the right stream.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-11 10:35:26 +03:00
Martin Storsjö
9ea78fd00a
rtpdec: Always check if we have the next packet queued
...
It doesn't matter what the actual reason for not returning
an AVPacket was - if we didn't return any packet and we have
the next one queued, parse it immediately. (rtp_parse_queued_packet
always consumes a queued packet if one exists, so there's no risk
for infinite loops.)
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-11 10:35:01 +03:00
James Almer
c8c14d0ffc
aarch64/synth_filter: fix compilation
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-10 23:33:12 -03:00
Chris Cunningham
542f725964
libavformat/oggdec: Free stream private when header parsing fails.
...
Leaking this private structure opens up the possibility that it may
be re-used when parsing later packets in the stream. This is
problematic if the later packets are not the same codec type (e.g.
private allocated during Vorbis parsing, but later packets are Opus
and the private is assumed to be the oggopus_private type in
opus_header()).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-11 03:50:37 +02:00
Rodger Combs
d645182227
lavfi/drawutils: support NV12 and NV21
2016-05-10 20:32:50 -05:00
James Almer
b2244fa0a6
avcodec/rscc: check input buffer size for deflate mode
...
Fixes overreads.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-10 22:07:19 -03:00
foo86
6c44696b3d
avcodec/dca: add DTS Express (LBR) decoder
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-10 20:33:28 -03:00
Felt, Patrick
fce7513122
avdevice/decklink_dec: Convert decklink input module to use codecpar
...
There are still a couple of deprecated calls that I’m not sure what to do with.
They are both related to some logic around AVCodecContext.coded_frame.
I couldn’t find anywhere that really documented what that was, or where it was intended to move to.
I left the warnings on.
Reviewed-by: Deti Fliegl <deti@fliegl.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-11 01:14:01 +02:00
Michael Niedermayer
ea791c080d
avformat/utils: Check bps before using it in a shift in ff_get_pcm_codec_id()
...
Fixes undefined shift
Fixes: usan_shift
Found-by: Thomas Guilbert <tguilbert@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-11 00:32:32 +02:00
Michael Niedermayer
8efaee3710
avformat/oggparseopus: Check that granule pos is within the supported range
...
Larger values would imply file durations of astronomic proportions and cause
overflows
Fixes integer overflow
Fixes: usan_int64_overflow
Found-by: Thomas Guilbert <tguilbert@google.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-11 00:32:32 +02:00
Jean Delvare
aeefe018f8
avfilter/delogo: Check that logo area is inside the picture
...
We can only remove the logo if it is inside the picture. We need at
least one pixel around the logo area for interpolation.
Fixes ticket #5527 (Delogo crash with x=0 and/or y=0).
Signed-off-by: Jean Delvare <jdelvare@suse.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-10 18:18:47 +02:00
Ronald S. Bultje
531ff7161d
vf_colorspace: don't enable passthrough if bitdepth doesn't match.
...
Also check return value of av_frame_copy() in passthrough mode, so that
if a copy fails (as it did here, because bitdepth didn't match), the filter
doesn't return success, which would mean sending an uninitialized framebuffer
further down the filtergraph.
2016-05-10 09:26:17 -04:00
Ronald S. Bultje
356c116536
vf_colorspace: fix range order.
2016-05-10 09:26:17 -04:00
Ronald S. Bultje
9bbed8645a
vf_colorspace: make whitepoint adaptation mode configurable.
...
Also add von kries whitepoint adaptation, and add 'identity' to turn
whitepoint adaptation off.
2016-05-10 09:26:16 -04:00
Ronald S. Bultje
3ed5218bd3
fate: add matroska-remux test.
...
This tests automatic insertion of the vp9_superframe BSF as well as
ensuring that the colorspace properties in the video header can be
modified when remuxing (-c:v copy).
2016-05-10 09:26:12 -04:00
Ronald S. Bultje
9c4943e671
ffmpeg: copy color properties in case of -c:v copy.
...
I have no idea why the first hunk uses ost->enc_ctx, because as far as
I understand, that is never used in case of -c:v copy, but this code
block is only entered if encoding_needed=0, which means stream_copy=1.
My point being: review from someone that knows this really well would
be appreciated.
2016-05-10 08:37:56 -04:00
Ronald S. Bultje
f4075767b2
vf_colorspace: use enums for bpp/subsampling array indices.
...
Also add some documentation for each function to colorspacedsp.h.
2016-05-10 08:37:56 -04:00
Ronald S. Bultje
9b26a8077f
vf_colorspace: add const to yuv_stride[] argument in DSP functions.
2016-05-10 08:37:55 -04:00
Ronald S. Bultje
431117dcb5
vf_colorspace: add floyd-steinberg dithering option to full conversion.
2016-05-10 08:37:55 -04:00
Mark Thompson
0c1d66a079
avconv_vaapi: fix double-free with some unsupported streams
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-05-10 11:30:25 +02:00
Jan Ekström
885a9d6087
pgssub: Fix subpicture colorspace and range
...
Widen the values from limited to full range and use BT.709 where it
should be used according to the video resolution:
SD is BT.601, HD is BT.709
Default to BT.709 due to most observed HDMV content being HD.
2016-05-10 11:30:25 +02:00
Jan Ekström
1f77e634bb
colorspace: Add support for BT709
...
BT.709 coefficients were gathered from the first two parts of BT.709
to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2).
They were additionally confirmed by manually calculating values.
2016-05-10 11:30:25 +02:00
Michael Niedermayer
283226e11c
simple_idct_template: Fix strict aliasing violation
...
This fixes fate-wmv8-intrax8 in certain configurations, e.g.
gcc 4.4.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-10 09:41:07 +03:00
Tobias Rapp
9486de5a85
avfilter/f_metadata: update print output header line format
...
Update print mode output header line format to be more consistent with
other log output of FFmpeg. The printf-modifiers have been inspired by
the showinfo filter.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-10 00:07:22 +02:00
Tobias Rapp
21f9fbce5c
avfilter/f_metadata: add pts_time to print output
...
This allows e.g. to correlate signalstats metadata to time position
without having to find out the filter chain timebase first.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-09 23:02:15 +02:00
Derek Buitenhuis
ca5ec2bf51
Merge commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec'
...
* commit '01621202aad7e27b2a05c71d9ad7a19dfcbe17ec':
build: miscellaneous cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-09 16:25:28 +01:00
Przemysław Sobala
1a3cff4f7e
libavutil/opt: add writing AV_OPT_TYPE_VIDEO_RATE AVOption
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-09 15:01:31 +02:00
Przemysław Sobala
5fce4753ff
avfilter/vf_fps: set fps value boundaries
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-09 15:01:07 +02:00
Derek Buitenhuis
38eeb85ff3
Merge commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330'
...
* commit 'e656a6ccd9cab1b0a79cffe3e609793857aae330':
configure: cosmetics: Drop pointless end-of-line semicolons
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:57:32 +01:00
Derek Buitenhuis
68b8505d4d
Merge commit '00658253e237ab975ae2d384e02b5936781f103d'
...
* commit '00658253e237ab975ae2d384e02b5936781f103d':
fate: Update DDS tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:55:28 +01:00
Derek Buitenhuis
d62984d8a0
Merge commit '22e49e6edead9c83696f20127988f659b952ce65'
...
* commit '22e49e6edead9c83696f20127988f659b952ce65':
dds: Simplify postprocessing check
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:50:09 +01:00
Derek Buitenhuis
6ebec1049e
Merge commit '02538636261fdec9c70f4185b23147c636f269b4'
...
* commit '02538636261fdec9c70f4185b23147c636f269b4':
dds: Add support for alpha-only files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:49:26 +01:00
Derek Buitenhuis
6c00703685
Merge commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc'
...
* commit '9a9fb710bcf4657e030467cfe2556cb0e2c01afc':
dds: Add support for rgb555 files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:49:04 +01:00
Derek Buitenhuis
486776d06f
Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'
...
* commit '8dde92b95a197eb809d798aacb34dbe52a0689a8':
fate: Update Screenpresso tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:46:58 +01:00
Derek Buitenhuis
483e9d8a2b
Merge commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf'
...
* commit 'ec8a69fab657f9cce624e8b0f4069d12696890bf':
screenpresso: Correctly handle keyframes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:43:55 +01:00
Derek Buitenhuis
5d31074daf
Merge commit '95db8c757cb003a71b040b567f38be74151deb5c'
...
* commit '95db8c757cb003a71b040b567f38be74151deb5c':
screenpresso: Add extended pixel format support
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:43:35 +01:00
Derek Buitenhuis
e4c8e19064
Merge commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914'
...
* commit 'b5f47d95c6cb8ffa9982eb8fd3e9ab5c9f97e914':
fate: Update RSCC tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:41:40 +01:00
Derek Buitenhuis
dd2d26dc82
Merge commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b'
...
* commit '51dc4de1218a81ee8e5b3f941839c5e3125a6d4b':
rscc: Add extended pixel format support
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:33:08 +01:00
Derek Buitenhuis
f0d4f3026d
Merge commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae'
...
This commit is a no-op.
* commit '4c6836db0f300d2c0401c6a1927a95c3258cc1ae':
nvenc_h264: Fix name of private AVClass
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:27:22 +01:00
Derek Buitenhuis
ee865e9780
Merge commit 'e3453fd44480d903338c663238bf280215dd9a07'
...
* commit 'e3453fd44480d903338c663238bf280215dd9a07':
matroska: Write the field order information
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:25:58 +01:00
Derek Buitenhuis
2d2af18f42
Merge commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d'
...
This commit is a no-op. We cherry picked it earlier.
* commit 'b3051a460cf02a5b86ff0d1e14abba23ea55ff6d':
vaapi_h264: Fix bit offset of slice data.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:07:55 +01:00
Derek Buitenhuis
13b77e09c7
Merge commit '33275a0de05e9bc321f2537a2a67921fab81624f'
...
* commit '33275a0de05e9bc321f2537a2a67921fab81624f':
ac3dec: change logging of skipped E-AC-3 substreams.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:07:01 +01:00
Derek Buitenhuis
15cb52577a
Merge commit 'fef2147b7a689b80d716c3edb9d4a18904865275'
...
* commit 'fef2147b7a689b80d716c3edb9d4a18904865275':
eac3dec: don't call avpriv_request_sample every frame.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:05:22 +01:00
Derek Buitenhuis
9109b5240b
Merge commit '1db8eb154908cde577477b6ab17430a0cd46b7bd'
...
* commit '1db8eb154908cde577477b6ab17430a0cd46b7bd':
avconv: Drop an unused variable
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:04:53 +01:00
Derek Buitenhuis
dc0152548f
Merge commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43'
...
* commit '6bb99757b780144d9fa27cdce09d3621e1a0ed43':
jack: Support OSX
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 23:02:33 +01:00
Derek Buitenhuis
f3972b3b7d
Merge commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1'
...
* commit '5f0226668124aa7ae4db501ba7f4ace4c770f3d1':
matroska: Support interlaced content correctly
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:58:18 +01:00
Derek Buitenhuis
f93c409c0b
Merge commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954'
...
* commit '44f05f15d4a34ef2f0d62259e5d5b43371bc0954':
build: Do not check the vaapi_encode.h header if VAAPI is not enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:53:50 +01:00
Derek Buitenhuis
4c3732c881
Merge commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d'
...
* commit 'bd016dbf23e8e7dc34ff2696912575f7620cec0d':
Mark tables used only within their files as static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:52:40 +01:00
Derek Buitenhuis
630586af88
Merge commit '061dc20351bf3b8a237216d2b39d3a3b736d1916'
...
* commit '061dc20351bf3b8a237216d2b39d3a3b736d1916':
h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:51:09 +01:00
Derek Buitenhuis
3005ee372d
Merge commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628'
...
* commit '69a638019fc0db4c2b75b36ef45d0acb6d2e9628':
avconv: fix -frames for video
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:50:46 +01:00
Derek Buitenhuis
939345854a
Merge commit '83f230c2445a94fdd94c66504482217fcece5909'
...
* commit '83f230c2445a94fdd94c66504482217fcece5909':
lavc: VAAPI MJPEG encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:46:52 +01:00
Derek Buitenhuis
a82d1a8c7a
Merge commit '31fe1f2577f8208f79a4b3ab59465e78dd497555'
...
* commit '31fe1f2577f8208f79a4b3ab59465e78dd497555':
lavc: VAAPI H.265 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:45:39 +01:00
Derek Buitenhuis
b975aeec02
Merge commit '2c62fcdf5d617791a653d7957d449f75569eede0'
...
* commit '2c62fcdf5d617791a653d7957d449f75569eede0':
lavc: VAAPI H.264 encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:43:52 +01:00
Derek Buitenhuis
508957fd0f
Merge commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e'
...
* commit '104c804bcaac24b52eb51ed17df2fb311e6ae73e':
lavc: VAAPI encode common infrastructure
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:41:12 +01:00
Derek Buitenhuis
172d3568b3
Merge commit '5d273d3efac340ef8de445c955ff44c7abed4e8f'
...
* commit '5d273d3efac340ef8de445c955ff44c7abed4e8f':
avconv: VAAPI hwcontext initialisation and hwaccel helper
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 22:39:39 +01:00
Christophe Gisquet
01938585f4
vc2: fate tests
2016-05-08 19:50:39 +01:00
Michael Niedermayer
5df703aa1b
avcodec/simple_idct_template: Fix strict aliasing violation
...
Fixes intrax8 test
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-08 20:40:27 +02:00
Rostislav Pehlivanov
b6c207f535
vc2enc_dwt: use 32 bit coefficients by default
...
The problem is that with particularly complex images and especially at
high bit depths and 5-level transforms the coefficients would overflow,
causing huge artifacts to appear. This was discovered thanks to the fate
tests, which will have to be redone as this fixes a multitude of
problems and increases PSNR.
There is a slight performance drop associated with this change, making
the encoder slower by 1.15 times, however this is necessary in order to
avoid undefined behavior and overflows.
It would be worth to template the transforms to keep the performance for
8 bit images as 32 bit coefficients are unnecessary for that case, but
the primary use of the encoder is to encode video at 10 bits.
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com >
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-05-08 19:09:42 +01:00
Hendrik Leppkes
64fd62d68a
avcodec/dxva2_h264: fix slice offset in long slice struct after ca2f19b9
...
The GetBitContext now includes the NAL header, which offsets the slice by
one byte, which needs to be accounted for here.
2016-05-08 17:48:19 +02:00
Mark Thompson
617cd45ddc
vaapi_h264: Fix bit offset of slice data.
...
Commit ca2f19b9cc modified the meaning of
H264SliceContext.gb: it is now initialised at the start of the NAL unit
header, rather than at the start of the slice header. The VAAPI slice
decoder uses the offset after parsing to determine the offset of the
slice data in the bitstream, so with the changed meaning we no longer
need to add the extra byte to account for the NAL unit header because
it is now included directly.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-08 16:46:04 +01:00
Michael Niedermayer
caee88d193
fate: Remove duplicate wmv8_x8intra.wmv test
...
Also temporary enable the test so we get updated fate failure statistics
Note, this does not work on all platforms, it fails on MIPS
and ml archives indicate it failed on x86 openbsd with some compilers as well
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-08 02:10:26 +02:00
Christophe Gisquet
9630b3fc06
x86: lossless audio: SSE4 madd 32bits
...
The unique user so far is wmalossless 24bits. The few samples tested show an
order of 8, so more unrolling or an avx2 version do not make sense.
Timings: 68 -> 49 cycles
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-07 23:28:48 +02:00
Derek Buitenhuis
e811ebcd9c
Merge commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7'
...
* commit 'ca8c7591735c0f80cc29e31e2e92cb10228e14c7':
intrax8: Remove mpegvideo dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:41:27 +01:00
Derek Buitenhuis
f2c7812839
Merge commit '6ebd06a9b2508747a135ee4c880d8f612e08932b'
...
* commit '6ebd06a9b2508747a135ee4c880d8f612e08932b':
intrax8: Drop lots of pointless parentheses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:40:21 +01:00
Derek Buitenhuis
741960e2f3
Merge commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c'
...
* commit '9b57995cdd489a4cff51dcc1a1f08ac77ec5a58c':
intrax8: Drop MB emulation code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:40:05 +01:00
Derek Buitenhuis
f110c624b1
Merge commit '9fa888c02801fff2e8817c24068f5296bbe60000'
...
* commit '9fa888c02801fff2e8817c24068f5296bbe60000':
intrax8: Keep a reference to the decoder blocks
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:39:44 +01:00
Derek Buitenhuis
c59c792470
Merge commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f'
...
* commit 'c2084ffcbfc11d1b6ed3a4a0df9cafd56fbb896f':
intrax8: Use the generic horizband function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:37:32 +01:00
Derek Buitenhuis
123fef54cc
Merge commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b'
...
* commit 'b1268e0f032a3af3912fe3fb8d3855e12d7ea83b':
intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:36:54 +01:00
Derek Buitenhuis
578fb5a27d
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
...
* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
intrax8: Pass macroblock size to ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:35:20 +01:00
Derek Buitenhuis
eee5a7cd7d
Merge commit '9f4d99138df434a73b097c997fb4cafc65f4ff54'
...
* commit '9f4d99138df434a73b097c997fb4cafc65f4ff54':
fate: Add test for WMV2 with jframes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:34:07 +01:00
Hendrik Leppkes
d46e856350
h265_parse: skip zero sized NAL units
...
Avoids extra error checks later on and/or invalid reads.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:14:23 +01:00
Hendrik Leppkes
d6f92103e0
h264: do not return an error when NAL parsing of extradata failed
...
Fixes AnnexB samples with broken extradata, but proper in-band parameter sets
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:14:17 +01:00
Hendrik Leppkes
772ad7142d
Merge commit 'ca2f19b9cc37be509d85f05c8f902860475905f8'
...
* commit 'ca2f19b9cc37be509d85f05c8f902860475905f8':
h264: switch to h2645_parse for NAL parsing
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com >
2016-05-07 21:13:44 +01:00
Hendrik Leppkes
9cc1ab63ac
h2645_parse: allow partial escaping
...
This ports the fix from 033a533 to the new parser module in prepartion
of using it for the h264 decoder.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:11:21 +01:00
Hendrik Leppkes
c802389393
h2645_parse: initialize the GetBitContext to the proper size
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:11:10 +01:00
Hendrik Leppkes
6eb1b40ad8
hevc: fix size condition in ptl parsing
...
When only one sublayer is present, no information is coded. Only when at least two
are present, all 8 sublayers are written.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-07 21:10:59 +01:00
Jan Sebechlebsky
1bc83f6ea8
avformat/tee: Use ref instead copy in write_packet
...
Replace av_copy_packet and deprecated av_dup_packet by
creating reference using av_packet_ref.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-05-07 17:25:40 +02:00
Jan Sebechlebsky
a3c877aca7
avformat/tee: Fix TeeSlave.bsfs pointer array size
...
TeeSlave.bsfs is array of pointers to AVBitStreamFilterContext,
so element size should be really size of a pointer, not size
of TeeSlave structure.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-05-07 17:24:15 +02:00
Marton Balint
215a2d7678
ffplay: force setting alsa buffer size
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-05-07 17:18:26 +02:00
compn
1e109bbbf1
riff: add comment for g721,g723 codec tags
...
Signed-off-by: Piotr Bandurski <ami_stuff@o2.pl >
2016-05-07 06:56:43 -04:00
Piotr Bandurski
e601e078e9
avformat/riff: add M102 FourCC
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-07 04:42:27 +02:00
Michael Niedermayer
fc6894770e
avcodec/m101: simplify 8bit code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-07 04:42:52 +02:00
Michael Niedermayer
22d1148c77
avcodec/m101: remove unneeded zeroing of priv_data_size
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-07 04:42:52 +02:00
Michael Niedermayer
cbe265ccd7
avcodec/m101: Simplify if() condition
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-07 04:42:52 +02:00
James Almer
03fceb771c
fate: fix dcadec test dependencies
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-06 18:52:27 -03:00
Martin Storsjö
e9443105ea
avio: Remove a leftover comment
...
The declarations that this comment referred to were removed
in 2439f2ca8 - there is no unbuffered IO in this header now.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-05-06 22:34:59 +03:00
Carl Eugen Hoyos
017d42ebc6
configure: Only utvideo <= 15.3.0 is supported.
...
Fixes ticket #5511 .
2016-05-06 19:42:35 +02:00
Michael Niedermayer
58b3e5606b
avcodec/avcodec: Move AV_CODEC_ID_M101 to the 2nd group of video codecs
...
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-06 15:57:14 +02:00
Michael Niedermayer
5621da4996
avformat/riff: add M101
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-06 15:36:24 +02:00
Michael Niedermayer
4155d5e06f
avcodec: add M101 decoder
...
Fixes Ticket 2611
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-06 15:36:24 +02:00
Timo Rothenpieler
31ce01bdb9
avcodec/nvenc: don't set profile in lossless mode
2016-05-06 10:15:29 +02:00
James Almer
bd63ecec78
avcodec/dcadsp: use LOCAL_ALIGNED_32 instead of LOCAL_ALIGNED(32, ...)
2016-05-06 00:47:55 -03:00
Andrey Utkin
abb69a2f2b
avcodec: Add "sar" alias to "aspect" option of video encoders
...
It is impossible to pass "aspect" parameter to encoder from ffmpeg CLI
because option from lavc/options_table.h is eclipsed by option with same
name in ffmpeg_opt.c, which has different meaning (DAR, not SAR).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-06 03:47:36 +02:00
Muhammad Faiz
1d4400ac7f
avfilter/graphparser: add '\r' as whitespace
...
for compatibility with platforms that treat it
as newline
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-05-06 07:37:12 +07:00
Muhammad Faiz
83065939cb
avutil/parsing: add '\r' as whitespace
...
for compatibility with platforms that treat it
as newline
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-05-06 07:35:45 +07:00
Christophe Gisquet
9c1aa14bf0
vc2enc: prevent random data
...
The slice prefix is 0 in the reference encoder and the decoder ignores it.
Writing 0 there seems like the best temporary solution.
The padding could have contained uninitialized data, but reference VC2
encoders put 0xFF there, hence the memset value.
Overall this allows producing bistreams with no random data for use by fate.
2016-05-06 01:12:51 +01:00
Petru Rares Sincraian
7a679e4ac0
fate: Add test for vorbis encoder
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-05 21:08:23 +02:00
Paul B Mahol
c5d2d3dced
avcodec/alac: fix 20-bit support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-05 18:15:22 +02:00
Rick Kern
f1560dbb2a
lavd/avfoundation: use AVCodecParameters
...
Fixes "Could not find codec parameters for stream" error (#5494 )
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-05 16:03:45 +02:00
Diego Biurrun
5afb94c817
Mark read-only tables as static
2016-05-05 10:48:34 +02:00
Diego Biurrun
1f1ad8ace0
configure: Document --enable-libfontconfig
2016-05-05 10:47:00 +02:00
Paul B Mahol
5b174dd3f1
avfilter/vf_waveform: fix order of graticule scale items
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-05 10:38:37 +02:00
Muhammad Faiz
d2f73c3daf
avfilter/avf_showcqt: add .
2016-05-05 14:03:32 +07:00
Michael Niedermayer
e7a9b434c5
fate: Add test for broken SPS (Ticket 2580)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-05 04:11:52 +02:00
Rostislav Pehlivanov
770d3c85af
vc2enc: do not print the lavc version if the bitexact flag is enabled
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-05-05 00:20:11 +01:00
James Almer
e3df56f5b4
avformat/dtsdec: reduce the scope of crctab
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-04 19:23:23 -03:00
foo86
bb7c558070
avformat/dtsdec: detect core-less streams
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-04 19:14:32 -03:00
James Almer
fe483ac428
avformat/mpegtsenc: fix usage of AVStream.codec
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-04 18:39:27 -03:00
James Almer
fc1c836def
avcodec/hevc_parser: fix packet_split function name
...
Fixes compilation of hevc_parser without hevc_decoder
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-04 18:26:06 -03:00
Michael Niedermayer
03e8c1b843
avformat/h264dec: Avoid get_ue_golomb_31( ) due to ff_ prefixed table from golomb.c
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-04 22:43:01 +02:00
Michael Niedermayer
824906a541
avformat/utils: Do not detect video codecs when audio is expected
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-04 22:19:44 +02:00
Michael Niedermayer
3646ef6f7c
avformat/h264dec: Check pps_id/sps_id fields from parameter sets
...
Fixes a misdetection in wav.detected.as.h264.error.wav
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-04 22:19:44 +02:00
Diego Biurrun
def03d1468
vf_frei0r: Drop overly verbose and broken debug output
2016-05-04 18:40:50 +02:00
Rick Kern
dc750194b6
lavc/videotoolboxenc: Set colorimetry values
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
c356b6865d
lavc/videotoolboxenc: Support pixel aspect ratio
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
9d8a38d20b
lavc/videotoolboxenc: Support for forced I-frames
...
Setting AVFrame.pic_type to AV_PICTURE_TYPE_I will force an I-frame.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
4b806081b2
lavc/videotoolboxenc: add concatentation properties
...
Add frames_before and frames_after as hints that there will be frames before
or after the frames produced in this session. This may help with
concatenation issues like bit rate spikes.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
ca429e7253
lavc/videotoolboxenc: Add realtime encoding property
...
Hint to the encoder that encoding should be done in real-time, even at the
expense of quality.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
272dd437bc
lavc/videotoolboxenc: Handle out-of-memory and fix memory leak
...
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
2fbf39382d
lavc/videotoolboxenc: Fix DTS
...
Some devices output an invalid DTS when B-frames aren't used. Using PTS for
the DTS in this case.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
abe05892be
lavc/videotoolboxenc: Fix AVCodecContext.has_b_frames usage.
...
Now set by the encoder, not used as an input parameter.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
645df43144
lavc/videotoolboxenc: Add entropy setting
...
Add an entropy setting to choose between CAVLC and CABAC.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
fbe0cf8ca7
lavc/videotoolboxenc: Require hardware encoding
...
Software encoding can be allowed by setting allow_sw to 1.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
0d4bf3074d
lavc/videotoolboxenc: Handle hwaccel format as input
...
Handle AV_PIX_FMT_VIDEOTOOLBOX.
This results in better energy usage and faster encoding, especially on iOS.
When the buffer comes from the media server, no memcpy's are needed.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Rick Kern
d7cf3610c2
lavc/videotoolboxenc: Use shared pixel buffer pool
...
This reduces the chance of a memcpy in the media server.
Signed-off-by: Rick Kern <kernrj@gmail.com >
2016-05-04 18:40:40 +02:00
Vittorio Giovara
41ed7ab45f
cosmetics: Fix spelling mistakes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-05-04 18:16:21 +02:00
Alexandra Hájková
5c31eaa999
Remove unnecessary get_bits.h #includes and add missing headers where needed.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-05-04 15:14:14 +02:00
Paul B Mahol
66eb5b809a
avcodec/adpcm: fix decoding of stereo non 4-bit ADPCM IMA WAV
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-04 11:33:34 +02:00
Paul B Mahol
3395ad48fa
avcodec/adpcm: replace char/short/long with int8_t/int16_t/int
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-04 00:36:02 +02:00
foo86
b7d267399b
avcodec/dca: convert to AVCRC
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-03 16:40:43 -03:00
smallishzulu
77a7ff8f05
lavf/mpegtsenc: Define service_type "HEVC digital television service".
...
Fixes ticket #5455 .
2016-05-03 21:35:21 +02:00
Thomas Volkert
f591b7b526
rtpenc: packetizer for VC-2 HQ RTP payload format (draft v1)
2016-05-03 19:07:37 +02:00
Michael Niedermayer
1ef267b83f
avcodec/h264: Put the removed SPS handling code back
...
reverts one hunk from 7966ddfc0b
The new code from 7966ddfc0b only covers extradata based SPS
Fixes: ffplay -ss 13 58af5798-fa2c-42a2-997d-dc8e49de2d8a.flv
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-03 15:56:57 +02:00
Diego Biurrun
c11c693acc
h264: Drop broken trace debug output
2016-05-03 15:45:11 +02:00
Diego Biurrun
5f1c3cbd52
vaapi: Drop pointless debug output
2016-05-03 15:45:11 +02:00
Diego Biurrun
015c2d9239
libopencore-amr: Fix ff_dlog()/av_log() invocations
2016-05-03 15:45:10 +02:00
Diego Biurrun
0f40c90984
Drop pointless assert.h #includes
2016-05-03 15:45:10 +02:00
Derek Buitenhuis
7966ddfc0b
Merge commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33'
...
* commit 'a7829a2a3f8e6ec0b9f2673c11f56916800aeb33':
h264: reimplement 3aa661ec5 in a more explicit way
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 13:42:38 +01:00
Carl Eugen Hoyos
fd0f1442eb
lavf/mpegtsenc: Fix stream_type for low sample rate MP2/MP3.
2016-05-03 14:15:14 +02:00
Derek Buitenhuis
a454ad670c
Merge commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe'
...
* commit 'add1467e5e447b79e8743a0b05c54dcf58c61dfe':
svq3: drop the build dependency on the h264 decoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:57:36 +01:00
Derek Buitenhuis
43b7e5aa32
Merge commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4'
...
* commit 'a4d126dc59c39bb03e5e444432d1b27af26a45b4':
svq3: eliminate remaining H264Context usage.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:52:14 +01:00
Derek Buitenhuis
2a018be10f
Merge commit '7bbdae81e895a49125dba58bad01b98389966c39'
...
* commit '7bbdae81e895a49125dba58bad01b98389966c39':
svq3: move block_offset to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:27:55 +01:00
Derek Buitenhuis
f32a23c849
Merge commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc'
...
* commit '1848a154a49d18c1f31f54ee75c7445dc49a7ecc':
svq3: stop using H264Context.gb
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:27:24 +01:00
Derek Buitenhuis
8bba752ae9
Merge commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690'
...
* commit 'ea6ab02a174bcc11f3eaa1b840c9a4c895968690':
svq3: move the frame num variables to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:24:33 +01:00
Derek Buitenhuis
014fb816d1
Merge commit '21b746932241246be846a133abb3c5f91b1cab85'
...
* commit '21b746932241246be846a133abb3c5f91b1cab85':
svq3: eliminate H264Context.cur_pic usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:24:08 +01:00
Derek Buitenhuis
2d3cc682c4
Merge commit '939b388383db8d0db5b2ff483e3a197c27b79791'
...
* commit '939b388383db8d0db5b2ff483e3a197c27b79791':
svq3: eliminate remaining H264SliceContext usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:23:23 +01:00
Derek Buitenhuis
5db920bcb6
Merge commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e'
...
* commit '5a5db90edf71ef4c60db8ad7b0ebaa9a810c2d9e':
svq3: move pict_type to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:17:34 +01:00
Derek Buitenhuis
1bfbdb8f0b
Merge commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c'
...
* commit '12f13ecb2dcddfa3ee930167395370d3c6fff90c':
svq3: move mb strides/sizes to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:15:54 +01:00
Derek Buitenhuis
297e2768da
Merge commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba'
...
* commit 'ad9d3384de08f02967d6eb11196ee8c78e8b2dba':
svq3: move the dequant buffer to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-05-03 10:15:22 +01:00
Carl Eugen Hoyos
80d14de52d
lavf/mpegts: Add E-AC3 registered stream specifier "EAC3".
...
Related to ticket #5501 .
2016-05-03 10:51:35 +02:00
Christophe Gisquet
7d453aaf65
wmalossless: allow calling madd_int16
...
This is done by actually handling the "prev_values" in the cascaded LMS data
as if it were int16_t, thus requiring switching at various locations the
computations.
2016-05-03 09:18:54 +02:00
Luca Barbato
74d98d1b0e
mpegts: Validate the SL Packet Header Configuration
...
timeStampLength, OCRLength and AU_Length have well specified upper
boundaries.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-05-03 14:21:45 +09:00
Michael Niedermayer
dc34fa6a9e
avformat/riff: add M702
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-03 01:07:31 +02:00
Michael Niedermayer
df820af2c5
avcodec/error_resilience: Improve missing slice handling for mpeg2
...
Fixes: m702_2.avi
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-03 01:07:24 +02:00
foo86
ce2f9fdb0a
avcodec/dca: fix sync word search error condition
...
This didn't actually check if sync word was found and always errored out
with "-err_detect explode" option enabled.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-02 23:26:44 +02:00
Michael Niedermayer
9fcb59c9bc
avcodec/options_table: fix strict compliance constant flags to match the strict field
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-02 22:16:57 +02:00
Michael Niedermayer
11db7eee9b
avformat/options_table: Add missing identifier for very strict compliance
...
Fixes Ticket5443
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-02 22:16:40 +02:00
Christophe Gisquet
79e86640ff
fate: wma: add lossless 24bits tests
...
Should evaluate coefficients and raw pcm tiles.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-02 21:50:10 +02:00
Diego Biurrun
1982d0cc56
fate: Add test for MTS2/MSS4
2016-05-02 16:12:04 +02:00
Michael Niedermayer
deaf58abf2
avcodec/mjpegdec: Do not try to detect last scan but apply idct after all scans for progressive jpeg
...
Fixes: IMG-20160418-WA0002.jpg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-02 12:45:14 +02:00
Jan Sebechlebsky
0ff3489534
avcodec/mjpeg2jpeg_bsf: Check ff_bsf_get_packet success
...
This fixes ticket #5487 - mjpeg2jpeg bitstream filter causes
segmentation fault with header-less mjpeg.
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-02 04:10:03 +02:00
foo86
1fee770a1c
avcodec/dca: move channel counter utility into dca.h
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-01 16:50:32 -03:00
foo86
2df7d4fa45
avcodec/dca: move huffman data into separate object file
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-01 16:50:29 -03:00
Paul B Mahol
bc2fe36228
avcodec/noise_bsf: set correct size of .priv_data_size field
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-01 22:23:48 +02:00
Michael Niedermayer
3187277ebb
avcodec/wmalosslessdec: Fix memset sizeof
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-01 18:44:06 +02:00
Michael Niedermayer
52623ef785
avcodec/smc: Mark pixel pointer as const
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-01 17:47:55 +02:00
Paul B Mahol
25482d5c42
avformat/wsddec: set bit_rate, fixes duration estimation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-01 16:25:57 +02:00
Paul B Mahol
423a6a0993
avformat/dsfdec: set bit_rate, fixes duration estimation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-01 16:16:39 +02:00
Carl Eugen Hoyos
88a849c714
lavf/mpegts: Return small probe score for very short transport streams.
...
Fixes Debian bug 823098.
2016-05-01 15:39:13 +02:00
Carl Eugen Hoyos
00ffbdfb68
lavc/fic: Do not warn about empty cursor.
...
Fixes ticket #5174 .
2016-05-01 15:30:22 +02:00
Carl Eugen Hoyos
47a11ff457
lavc/fic: Be less verbose for invisible cursor outside of video.
2016-05-01 15:28:59 +02:00
Clément Bœsch
9f3dd53050
lavc/srtenc: do not emit any subrip tags with text codec
...
Fixes presence of opening tags when running
ffmpeg -i x.ass -c text x.srt
Reported-by: Jean First <jeanfirst@gmail.com >
2016-05-01 15:16:50 +02:00
Clément Bœsch
bbf02f7d28
lavc: override decode return value only in case of error
...
Fixes Ticket #5350
Regression since 2941282124 .
2016-05-01 14:53:53 +02:00
Christophe Gisquet
532e937083
avcodec/wmalosslessdec: silence a sample request
...
16bits samples with CDLMS orders of 8 are currently unsupported, but have never
been encountered before.
However, 8 seems to be the most frequent, if not the only order used for 24bits.
In that case, the dsp functions are fine with handling order that are multiples
of 8, so silence the warning.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-01 11:18:09 +02:00
Paul B Mahol
8f4358888f
avcodec/wmalosslessdec: fix type for coeffs and lms_updates in cdlms struct
...
They should really be int16_t.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-05-01 10:49:12 +02:00
foo86
b286ff69c0
avcodec/dcaenc: move channel reordering tables to dcaenc.h
...
DCA core decoder no longer uses fixed tables for channel reordering.
Move them into private encoder header (and drop ff_dca_ prefix).
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-01 00:13:41 -03:00
foo86
de28e73cce
avcodec/dcaenc: reuse shared quant levels table
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-05-01 00:13:37 -03:00
Michael Niedermayer
9a499e0ae7
avformat/riff: add m704
...
(Ticket 2616)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-01 01:43:06 +02:00
Michael Niedermayer
cb84c12fa2
avcodec/mpeg12dec: Print position in end mismatch error
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-01 01:43:06 +02:00
Michael Niedermayer
390703fcf5
avcodec/mpeg12dec: Do not choke on extra m704 alpha data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-05-01 01:43:06 +02:00
Martin Storsjö
375cad0965
rtpdec_vp9: Support parsing the scalability structure
...
We still only support one single layer though, but this allows
receiving streams that have this structure present even for
single layer streams.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-30 20:58:23 +03:00
Martin Storsjö
943f4bea37
rtpdec_h264: Use avpriv_report_missing_feature instead of a manual av_log
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-30 20:58:18 +03:00
Martin Storsjö
b55e3633d3
rtpdec: Use AVERROR_PATCHWELCOME instead of AVERROR(ENOSYS) for unimplemented features
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-30 20:57:44 +03:00
Martin Storsjö
70c77fdfc1
rtpdec_vp9: Update header parsing to spec draft 02
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-30 20:57:41 +03:00
Martin Storsjö
33b83d89e3
rtpdec_vp9: Make sure to free the temp buffer on close
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-30 20:57:31 +03:00
Paul B Mahol
a67816bcce
avcodec/wmalosslessdec: fix decoding of raw pcm tiles
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-30 19:56:53 +02:00
Paul B Mahol
675cfb2f86
avformat/iff: fix deadlock in parsing dsd chunks
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-30 18:06:53 +02:00
Paul B Mahol
d171cd076f
avformat/dsfdec: check if number of channels is <= 0
...
Fixes FPE bellow.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-30 17:50:22 +02:00
Peter Ross
10d48c63b2
avformat: add Wideband Single-bit Data (WSD) demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-30 17:45:36 +02:00
Janne Grunau
c267413321
Revert "mmaldec: autodetect by default" since it breaks linking on systems without mmal libraries
...
This reverts commit 33ac77e850 .
2016-04-30 16:05:32 +02:00
Carl Eugen Hoyos
a2810d03b9
configure: Add pixelutils dependency for framerate filter.
2016-04-30 13:35:24 +02:00
wm4
33ac77e850
mmaldec: autodetect by default
...
It qualifies as a system library.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:34:10 +02:00
wm4
74beead9bd
mmaldec: limit internal buffering
...
This uses a new MMAL feature, which limits the number of extra frames
that can be buffered within the decoder. VIDEO_MAX_NUM_CALLBACKS can
be defined as positive or negative number. Positive numbers are
absolute, and can lead to deadlocks if the user underestimates the
number of required buffers. Negative numbers specify the number of extra
buffers, e.g. -1 means no extra buffer, (-1-N) means N extra buffers.
Set a gratuitous default of -11 (N=10). This is much lower than the
firmware default, which appears to be 96.
This is backwards compatible, but needs a symbol only present in newer
firmware headers. (It's an enum item, so it requires a check in
configure.)
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:31:08 +02:00
wm4
45a954f5aa
mmaldec: print the MMAL format FourCC automatically
...
Slight simplification. The result is the same. Also, change the
wording of the message as requested in patch review.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:29:13 +02:00
wm4
84bba36846
configure: fix mmal build dependencies
...
The mmal decoders do not depend on the software decoders.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:27:48 +02:00
wm4
ce589940c2
mmaldec: send only a single EOS packet on flushing
...
Fixes apparent mmal_port_disable() freezes in ffmmal_stop_decoder() when
calling ffmmal_decode() with flush semantics a large number of times in
a row.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:26:22 +02:00
wm4
46aaad78c3
mmaldec: correct package buffering accounting
...
The assert in ffmmal_stop_decoder() could trigger sometimes. The
packets_buffered counter was indeed not correctly maintained, and
packets were not subtracted from it if they were still in the waiting
queue.
For some reason, this happened especially with VC-1.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:19:58 +02:00
wm4
9a382f3639
mmaldec: add vc1 decoding support
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:19:53 +02:00
Julian Scheel
d52208e8d5
mmaldec: Add mpeg2 decoding support
...
Register mmaldec as mpeg2 decoder. Supporting mpeg2 in mmaldec is just a
matter of setting the correct MMAL_ENCODING on the input port. To ease the
addition of further supported mmal codecs a macro is introduced to generate
the decoder and decoder class structs.
Signed-off-by: Julian Scheel <julian@jusst.de >
Signed-off-by: wm4 <nfxjfg@googlemail.com >
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:11:13 +02:00
Julian Scheel
2689bb115c
mmaldec: Fix avpriv_atomic_get usage
...
There is no avpriv_atomic_get, instead avpriv_atomic_int_get is to be used for
integers. This fixes building mmaldec.
Signed-off-by: Julian Scheel <julian@jusst.de >
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:00:58 +02:00
Michael Niedermayer
366ba2dee1
mmaldec: Use av_assert0() instead of assert()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-30 08:00:02 +02:00
Diego Biurrun
f2422b5875
testprogs: Mark some tables as static const
2016-04-29 16:21:23 +02:00
wm4
66dd21d50b
avcodec/utils: split side-data in new decode API too
...
The deprecated avcodec_decode_video2() and avcodec_decode_audio4()
functions called av_packet_split_side_data() on the input packets. This
is required for packets produced by libavformat with the
AVFMT_FLAG_KEEP_SIDE_DATA flag unset (which is unfortunately the
default).
The new API didn't do this yet, although it didn't matter as no decoder
supports the new API yet. The emulation layer for the old API calls the
old API functions, which took care of the splitting. Add this code to
the new API codec entrypoints too, because we shouldn't send essentially
corrupted data to decoders.
2016-04-29 10:35:00 +02:00
Michael Niedermayer
78baa450d9
avformat/ffmdec: Check pix_fmt
...
Fixes crash
Fixes Ticket5412
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-28 23:25:18 +02:00
Kieran Kunhya
e9a9ca1936
avcodec/cfhd: Don't decode coefficients if no end of header tag found. Fixes fuzzed files such as the one in in ticket #5383
2016-04-28 21:33:08 +01:00
Dave Yeo
3cb3dddeb4
configure: Allow choice in choosing a symlink command
...
Signed-off-by: Dave Yeo <daveryeo@telus.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-28 02:33:10 +02:00
Dmitriy Kuminov
5d7696fe2b
configure: Do not create/install versioned DLLs on OS/2.
...
Only one DLL for each module must be present on OS/2: SLIBNAME_WITH_MAJOR
(the same as on Windows). Creating other DLLs makes no sense as they can't
be used.
Signed-off-by: Dave Yeo <daveryeo@telus.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-28 02:32:53 +02:00
Александр Слободенюк
688664e02d
avformat/riff: support for matrox m703 mpeg-2
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-28 02:30:59 +02:00
Michael Niedermayer
492011f3c6
avutil/log: Fix occured typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-28 01:06:54 +02:00
Piotr Bandurski
55e6323090
avformat/riff: assign g721 and g723 codec tags to g726 decoder
2016-04-28 00:01:35 +02:00
Timo Rothenpieler
c4312b1cf4
avcodec/nvenc: Add missing lossless presets to doc string
2016-04-27 22:22:29 +02:00
Timo Rothenpieler
bc4137d4aa
configure: Don't require nonfree for nvenc
...
As the nvEncodeApi.h header is now MIT licensed, this can be dropped.
The loaded CUDA and NVENC libraries are part of the nvidia driver, and
thus count as system libraries.
2016-04-27 20:17:33 +02:00
Andreas Weis
333207224f
avutil/log: added test case for av_log_format_line2
...
Signed-off-by: Andreas Weis <github@ghulbus-inc.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-27 19:23:05 +02:00
Andreas Weis
fb9187129c
avutil/log: added av_log_format_line2 which returns buffer length
...
The new function behaves the same as av_log_format_line, but also forwards
the return value from the underlying snprintf call. This will allow
callers to accurately determine the size requirements for the line buffer.
Signed-off-by: Andreas Weis <github@ghulbus-inc.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-27 19:23:05 +02:00
Derek Buitenhuis
6f784c158b
Merge commit '549fc77273636d0d02175362af5dcd60c79f7633'
...
* commit '549fc77273636d0d02175362af5dcd60c79f7633':
svq3: move mb2br_xy to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:52:02 +01:00
Derek Buitenhuis
f09fd96cee
Merge commit '99dde60391cade40ae026b9e385a5280be6b9882'
...
* commit '99dde60391cade40ae026b9e385a5280be6b9882':
svq3: move {ref,mv}_cache to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:49:19 +01:00
Derek Buitenhuis
c0b51aa2d2
Merge commit '89a13998a1b5074411dff5a461dce3837057b0b8'
...
* commit '89a13998a1b5074411dff5a461dce3837057b0b8':
svq3: rip out the svq3-relevant parts of pred_motion() out of h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:48:30 +01:00
Derek Buitenhuis
fed686af23
Merge commit '8eecae77ff6e2923de57dd883421d24fd53ca61f'
...
* commit '8eecae77ff6e2923de57dd883421d24fd53ca61f':
svq3: move edge_emu_buffer to the SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:47:52 +01:00
Derek Buitenhuis
463de5625b
Merge commit '527bf5f7c6890664b0f1dccd42397f4d204659fe'
...
* commit '527bf5f7c6890664b0f1dccd42397f4d204659fe':
svq3: move the pred mode variables to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:46:54 +01:00
Derek Buitenhuis
a2922b5d61
Merge commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad'
...
* commit 'ecc31f6b086453ab9811dce2ae5ceb6a7c19e4ad':
h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:34:40 +01:00
Derek Buitenhuis
c18535399d
Merge commit '1877712c586df2261f2806f45388c77592b89d1e'
...
* commit '1877712c586df2261f2806f45388c77592b89d1e':
svq3: move mb_{x,y,xy} to SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:07:47 +01:00
Derek Buitenhuis
7dca134285
Merge commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600'
...
* commit 'c2a4ca944d9029a3c162f8f3ddd317b83a7bd600':
svq3: eliminate write_back_intra_pred_mode() usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:07:19 +01:00
Derek Buitenhuis
47bb289170
Merge commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3'
...
* commit 'c73fb9efb22c8d66d24de2716f7f9970f234c3c3':
svq3: add all the required dsp contexts into SVQ3Context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:06:42 +01:00
Derek Buitenhuis
656b071a8f
Merge commit '15b0517da986b312fc2fcb364a92db328380b15b'
...
* commit '15b0517da986b312fc2fcb364a92db328380b15b':
svq3: make the dsp functions static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 16:06:12 +01:00
Derek Buitenhuis
d6f01c61ed
Merge commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776'
...
* commit '9b30f8dd8fa5bef5f16904cb98745b4a58f8f776':
h264: remove the svq3-specific code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 15:48:00 +01:00
Ivan Uskov
b577a54a7c
qsv: Fix wrong ticks_per_frame for H.264
...
For H.264 stream ticks_per_frame should be 2, as per the docs.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-27 15:33:53 +01:00
Umair Khan
a2ba50b03a
avcodec/alsdec: Fix bitstream reading
...
Signed-off-by: Umair Khan <omerjerk@gmail.com >
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-27 13:15:12 +02:00
Diego Biurrun
5b1409c755
fate: Add test for MSS1
2016-04-27 11:57:45 +02:00
Paul B Mahol
1f62a6e780
avcodec/shorten: make max frame size bigger if custom block size was used
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-27 09:08:45 +02:00
Michael Niedermayer
566d64d4fb
avcodec/h264: Only recover from reference pictures
...
Fixes spec compliance
Fixes Ticket5346
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-27 01:33:25 +02:00
Vittorio Giovara
4b2e69397b
dds: Add support for monochrome images
2016-04-26 16:30:18 -04:00
Vittorio Giovara
6eb2505855
dds: Drop gray-alpha swapping
...
The original sample was generated with invalid software.
2016-04-26 16:30:04 -04:00
Michael Niedermayer
4efd3ec50a
avcodec/svq3: fix assert type (was av_assert2 in h264 from where this was copied)
...
Type was lost in f8d1bb2f2c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-26 21:45:47 +02:00
Michael Niedermayer
005c61c6b8
avcodec/ttaenc: Reallocate packet if its too small
...
Fixes assertion failure
Fixes Ticket5394
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-26 19:45:59 +02:00
Rodger Combs
e1c20485c1
lavc/audiotoolboxdec: move to new BSF API
2016-04-26 10:35:09 -05:00
Rodger Combs
95116bf35f
lavc/audiotoolboxdec: fix memory leak
2016-04-26 10:35:09 -05:00
Nicolas George
0cb19c30c6
lavf/concatdec: clear extradata when inserting h264_mp4toannexb bsf.
...
Fix remuxing H.264-in-MP4 to Matroska, possibly others.
2016-04-26 16:58:59 +02:00
Nicolas George
b8fa374fb6
lavf/concatdec: remove unrelated change during codecpar merge.
...
Clearing the extradata is not related to the codecpar change,
and it breaks if auto_convert is disabled.
Fix trac ticket #5461 .
2016-04-26 16:58:59 +02:00
Derek Buitenhuis
f8d1bb2f2c
Merge commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c'
...
* commit 'e42ca48a8bddc637a4013ab253598973f07e1a5c':
svq3: rip out the mb decoding code shared with h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-26 15:11:59 +01:00
Derek Buitenhuis
ee38234c43
Merge commit 'e481458bc308ee838deaeacac51929514762e7a7'
...
* commit 'e481458bc308ee838deaeacac51929514762e7a7':
h264: factor out pred weight table parsing into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-26 15:04:29 +01:00
Derek Buitenhuis
79aafd43fd
Merge commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386'
...
* commit '90ed6c5cf7f236bc9efb47c97b40358c666d1386':
h2645_parse: compute the actual data length, without trailing paddding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-26 14:27:35 +01:00
Derek Buitenhuis
438ed974b8
Merge commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977'
...
* commit 'b667252a41fbf5a3f6ea8c67fdbc03db3d748977':
h2645_parse: add support for parsing h264
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-26 14:07:03 +01:00
Derek Buitenhuis
b5c10c4c92
Merge commit '52ec149fbee57b6ca817049c9706212a0774a32c'
...
* commit '52ec149fbee57b6ca817049c9706212a0774a32c':
h2645_parse: change the AVCodecContext* parameter to void*
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-26 14:04:48 +01:00
Derek Buitenhuis
8e73574d4f
Merge commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe'
...
* commit '8229eff4b7a98ae5d85bb75f3bb072781b4a8ebe':
h2645_parse: add a function for uninitializing the packet
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-26 14:01:45 +01:00
Derek Buitenhuis
3c4ca4c5d7
Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'
...
* commit 'fa936a307f5cddfc2664600157a8207ca8080af6':
hevc_parse: rename into h2645_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-26 13:56:47 +01:00
Martin Storsjö
39cdbb12aa
dxva2_h264: Unbreak compilation after 3176217c6
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-25 22:44:59 +03:00
Derek Buitenhuis
492d229303
qsvenc_hevc: Fix usage of ff_hevc_extract_rbsp
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-25 20:03:23 +01:00
Martin Vignali
3ce19882c5
libavcodec/exr: move xsize and ysize to thread data
...
Fixes slice threading.
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-25 14:19:05 -03:00
Derek Buitenhuis
4791a910c0
lavc/hevc_parse: Don't take a HEVCContext
...
It's not even used anymore, and the checks are no longer
functionally important.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-25 14:40:33 +01:00
Michael Niedermayer
9ac154d1fa
avcodec/ac3dec: Reset SPX when switching from EAC3 to AC3
...
Fixes Ticket5319
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-25 04:08:21 +02:00
Jan Ekström
9779b62624
pgssubdec: fix subpicture output colorspace and range
...
Functionality used before didn't widen the values from limited to
full range. Additionally, now the decoder uses BT.709 where it
should be used according to the video resolution.
Default for not yet set colorimetry is BT.709 due to most observed
HDMV content being HD.
BT.709 coefficients were gathered from the first two parts of BT.709
to BT.2020 conversion guide in ARIB STD-B62 (Pt. 1, Chapter 6.2.2).
They were additionally confirmed by manually calculating values.
Fixes #4637
2016-04-24 23:05:04 +02:00
Derek Buitenhuis
87b8e95008
Merge commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873'
...
* commit 'cdb1665f70def544ddab3e3ed3763ef99c8b3873':
aarch64: Make transpose_4x4H do a regular transpose
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:51:42 +01:00
Derek Buitenhuis
4fe4c5c376
Merge commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e'
...
This merge is a no-op.
* commit 'edf54887e2935a30f9d9a46dd806802c3c867c0e':
rtpdec_jpeg: fix low contrast image on low quality setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:49:00 +01:00
Derek Buitenhuis
896fce8509
Merge commit '159323897f545e7405fb9db234e0ba123e174376'
...
* commit '159323897f545e7405fb9db234e0ba123e174376':
intrax8: Add a local BlockDSPContext and initialize it
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:36:23 +01:00
Derek Buitenhuis
52692eed61
Merge commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3'
...
* commit '1eaae7abb8f208fefb4e8b9e983e61b2499206a3':
intrax8: Reference the current AVCodecContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:34:58 +01:00
Derek Buitenhuis
50fa5715bc
Merge commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5'
...
* commit '8072345e9f86d88fbc4a15c17cb03f1e4701c9a5':
intrax8: Keep a reference to the GetBitContext reader
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:34:16 +01:00
Derek Buitenhuis
93c61c980d
Merge commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0'
...
* commit '65f14128c4bcf8fcd9d3ba1e20b7a22057c9cfb0':
intrax8: Use a constant buffer instead of a ScratchpadContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:33:07 +01:00
Derek Buitenhuis
36dad14693
Merge commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64'
...
* commit 'eaeba6f241e0de0e797be10f8fda967ef8489e64':
intrax8: Pass the output frame to the decoding function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:32:38 +01:00
Derek Buitenhuis
e5c655b098
Merge commit '577393321c389ad2973bec6168a8045c94a9e099'
...
* commit '577393321c389ad2973bec6168a8045c94a9e099':
intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:31:14 +01:00
Derek Buitenhuis
83e0b1b1d7
Merge commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a'
...
* commit '68127e1bf8037a6e0acd6401cc8c5da950e3fa0a':
intrax8: Keep a reference to the context idctdsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:19:53 +01:00
Derek Buitenhuis
627115b3e4
Merge commit '65127450add50c3bca307edc0517d2e8382717a0'
...
* commit '65127450add50c3bca307edc0517d2e8382717a0':
intrax8: Make x8_init_block_index not use mpegvideo fields
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:16:16 +01:00
Derek Buitenhuis
1a9ffc59d2
Merge commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f'
...
* commit '922b7e6d86e6197dfa5ebde602dd12cc66fb5f1f':
intrax8: Use local destination buffers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 12:08:11 +01:00
Derek Buitenhuis
9809371aa5
Merge commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923'
...
* commit 'a7da517f6a5c472f46f67dd33bb6b95ccc919923':
h264data: Move all data tables from a header to a .c file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 11:54:53 +01:00
Derek Buitenhuis
a5a6621616
Merge commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef'
...
* commit 'f4d581cda3897f66c1dda7586b93f86a591dbbef':
lavc: Deduplicate zigzag_scan table
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 11:47:39 +01:00
Michael Niedermayer
2e67a99fbc
avfilter/vf_drawtext: Check return code of load_glyph()
...
Fixes segfault
Fixes Ticket5347
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-24 12:39:25 +02:00
Derek Buitenhuis
64ae08ffec
Merge commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db'
...
* commit '02cd8bb9cb4381c50f42a9284098cc8a33d397db':
h264: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-24 11:36:44 +01:00
Michael Niedermayer
c84ba07db4
avformat/mux: Check that deinit is set before calling it
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-24 12:07:37 +02:00
Luca Barbato
4012fe1ee8
ape: Unbreak adaptcoeffs computation
...
And simplify and explain the expression.
Fault introduced in f3fdef108e
2016-04-24 10:18:25 +02:00
Anton Khirnov
2e5bde9565
h264: eliminate max_contexts
...
It is always equal to nb_slice_ctx.
2016-04-24 10:06:25 +02:00
Anton Khirnov
e3c9041cfe
h264: allocate some tables per slice contexts, not threads
...
This is more correct and avoids wasting space when frame threading is
used.
2016-04-24 10:06:25 +02:00
Anton Khirnov
e065279529
h264: remove an artificial restriction on the number of slice threads
...
This limit is now unnecessary, we can easily support an arbitrary number
of threads.
2016-04-24 10:06:25 +02:00
Anton Khirnov
4fd34e639d
h264: remove pointless setting of some variables in loop_filter
...
Those should already be set to the correct values.
2016-04-24 10:06:25 +02:00
Anton Khirnov
9c858ce33f
h264: remove a pointless comment
2016-04-24 10:06:25 +02:00
Anton Khirnov
b77fffa127
h264: make slice threading work with deblocking_filter=1
...
In such a case, decode the MBs in parallel without the loop filter, then
execute the filter serially.
The ref2frm array was previously moved to H264SliceContext. That was
incorrect, since it applies to all the slices and should properly be in
H264Context (it did not actually break decoding, since this distinction
only becomes relevant with slice threading and deblocking_filter=1,
which was not implemented before this commit). The ref2frm array is thus
moved back to H264Context.
2016-04-24 10:06:25 +02:00
Anton Khirnov
370ddc7b38
h264: remove H264Context.pict_type
...
It is not used for anything internally, just exported in the output
frames. So remove the indirection and set it directly in frame_start().
2016-04-24 10:06:25 +02:00
Anton Khirnov
56087ec0a2
h264: drop a pointless indirection
2016-04-24 10:06:25 +02:00
Anton Khirnov
0e7772c5e4
h264: remove unused H264SliceContext.rbsp_buffer
2016-04-24 10:06:25 +02:00
Anton Khirnov
7f045c4429
h264: merge ff_h264_free_context() into h264_decode_end()
...
It is no longer called from outside the h264 decoder.
2016-04-24 10:06:24 +02:00
Anton Khirnov
99c554efc8
h264: eliminate low_delay
...
It is always unconditionally initialized in decode_postinit() and then
immediately used in one place further below. All the other places where
it is accessed are just useless fluff.
2016-04-24 10:06:24 +02:00
Anton Khirnov
5b35b290dd
h264: remove a stale comment
...
This comment used to apply to code that was removed.
2016-04-24 10:06:24 +02:00
Anton Khirnov
89ae244e78
h264_refs: remove an unused parameter from ff_h264_fill_mbaff_ref_list()
2016-04-24 10:06:24 +02:00
Anton Khirnov
755f79f84c
h264_refs: make the H264Context const where possible
2016-04-24 10:06:24 +02:00
Anton Khirnov
a2fd547839
h264_refs: reorder functions to avoid forward declarations
2016-04-24 10:06:24 +02:00
Anton Khirnov
0ba471d7d8
h264: eliminate copy_fields
...
It is very fragile against fields being moved and hides what is actually
being copied. Copy all the fields explicitly instead.
2016-04-24 10:06:24 +02:00
Anton Khirnov
72da8d9bb2
h264_parser: remove the remaining dependencies on the h264 decoder
2016-04-24 10:06:24 +02:00
Anton Khirnov
98c97994c5
h264: decouple extradata parsing from the decoder
...
This will allow decoupling the parser from the decoder.
2016-04-24 10:06:24 +02:00
Anton Khirnov
728d90a0c1
h264: decouple h264_sei from the h264 decoder
...
Make the SEI parsing independent of the H264Context, to allow
decoupling the parser from the decoder.
2016-04-24 10:06:24 +02:00
Anton Khirnov
c8dcff0cdb
h264: factor out calculating the POC count into a separate file
...
This will allow decoupling the parser from the decoder.
2016-04-24 10:06:24 +02:00
Anton Khirnov
113aeee6ae
h264_parser: move the H264DSPContext to the parser context
2016-04-24 10:06:24 +02:00
Anton Khirnov
3176217c60
h264: decouple h264_ps from the h264 decoder
...
Make the SPS/PPS parsing independent of the H264Context, to allow
decoupling the parser from the decoder. The change is modelled after the
one done earlier for HEVC.
Move the dequant buffers to the PPS to avoid complex checks whether they
changed and an expensive copy for frame threads.
2016-04-24 10:06:23 +02:00
Anton Khirnov
44d16df413
h264_parser: eliminate H264SliceContext usage
...
It is no longer needed for anything.
2016-04-24 10:06:23 +02:00
Anton Khirnov
71d3305c27
h264_parse: make sure the ref count is zeroed on all failure paths
2016-04-24 10:06:23 +02:00
Anton Khirnov
a6e27f7add
h264: factor out parsing the reference count into a separate file
...
This will allow decoupling the parser from the decoder.
2016-04-24 10:06:23 +02:00
Anton Khirnov
56b17a33f2
h264: stop testing whether the reference count changes in ff_set_ref_count()
...
It is no longer necessary after 741b494fa8
2016-04-24 10:06:23 +02:00
Anton Khirnov
e9f884416c
h264: move reading direct_spatial_mv_pred out of ff_set_ref_count()
...
It has nothing to do with the reference count and so does not belong in
this function.
2016-04-24 10:06:23 +02:00
Anton Khirnov
8d0cc8ca97
h264_parser: switch to h2645_parse for NAL unescaping
...
Remove now unused ff_h264_decode_nal().
2016-04-24 10:06:23 +02:00
Anton Khirnov
f3ed484953
h264_mp4toannexb_bsf: do not fail on annex B extradata
...
Just pass through the bitstream as is. This is the same as what is done
for HEVC already.
2016-04-24 10:06:23 +02:00
Michael Niedermayer
dbe1dd59e0
avformat/mpegts: Skip over broken 0x80 headers
...
This fixes demuxing of 01c56b0dc1.ts
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-24 02:51:50 +02:00
Michael Niedermayer
ea41ab0987
avformat/mpegts: factor duplicate seek back code into mpegts_resync
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-24 02:51:50 +02:00
Michael Niedermayer
38433345e5
avcodec/utils: Assert that the number of consumed bytes in avcodec_decode_audio4() is <= the input size
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-23 17:23:59 +02:00
Carl Eugen Hoyos
0499012a55
lavf/isom: Support Perian tag NELL for nellymoser.
...
Reported by forum user turas35.
2016-04-23 11:11:32 +02:00
Michael Niedermayer
a39e3e5e7b
avutil/aes: Remove duplicate include
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-23 02:05:53 +02:00
Jan Sebechlebsky
2063f3ed9c
avformat/tee: Handling slave failure in tee muxer
...
Adds per slave option 'onfail' to the tee muxer allowing an output to
fail, so other slave outputs can continue.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-04-22 20:04:27 +02:00
Jan Sebechlebsky
f9d7e9feec
avformat/tee: Fix leaks in tee muxer when open_slave fails
...
In open_slave failure can happen before bsfs array is initialized,
close_slave must check that bsfs is not NULL before accessing
tee_slave->bsfs[i] element.
Slave muxer expects write_trailer to be called if it's
write_header suceeded (so resources allocated in write_header
are freed). Therefore if failure happens after successfull
write_header call, we must ensure that write_trailer of
that particular slave is called.
Some cleanups are made by Marton Balint.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-04-22 19:49:50 +02:00
wm4
27adf9f9cd
avcodec/utils: fix minor memory leaks on avcodec_open2() failure
2016-04-22 19:29:48 +02:00
Derek Buitenhuis
53a9b164c5
Merge commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7'
...
* commit '704a39769719d2e1ae3f13bfc562b51c9cd002d7':
rtmpdh: add an stdio.h include
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-22 17:21:52 +01:00
Derek Buitenhuis
a980cc47cd
Merge commit 'e3dfef8e3c85a64dbe6388117303f5819fa3c6a2'
...
This commit is a no-op. Ivan Uskov is going to port it for us.
* commit 'e3dfef8e3c85a64dbe6388117303f5819fa3c6a2':
qsvdec_h2645: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-22 17:20:57 +01:00
Lou Logan
3eafbbe70a
doc/APIchanges: Fix bitsream typo
...
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-04-21 22:06:05 -08:00
Michael Niedermayer
268b5ae10a
doc/APIchanges: Fix bistream typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-22 04:48:38 +02:00
Michael Niedermayer
7b7c338e9a
avfilter: Add AV_OPT_FLAG_FILTERING_PARAM to where it was missing
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-21 20:20:42 +02:00
Paul B Mahol
c85d04251d
avcodec: add TrueMotion 2.0 Real Time decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-21 20:15:17 +02:00
Vittorio Giovara
5fca95c8e5
libx264: Forbid inverted Stereo3D mode
2016-04-21 12:25:42 -04:00
Vittorio Giovara
9e2af0e907
libx264: Allow Stereo3D monoscopic value
2016-04-21 12:24:35 -04:00
Derek Buitenhuis
aa40df483b
Merge commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4'
...
* commit 'a638e9184d63e57e67901f34afe919fd56fd3ac4':
vf_fade: make sure the slice end is always in the frame
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 16:52:03 +01:00
Derek Buitenhuis
5f587b1daf
Merge commit '3b08d9d932eef09403074d5af31e10d8011e840b'
...
* commit '3b08d9d932eef09403074d5af31e10d8011e840b':
testprogs: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 16:50:06 +01:00
Derek Buitenhuis
32c044cbc6
Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
...
* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48':
testprogs: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 16:04:17 +01:00
Derek Buitenhuis
53107052b2
Merge commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093'
...
* commit '3dfbf32b95ae69a9b15cd4912bc1c68fa16b4093':
build: Drop redundant removal of compiled object files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 16:03:43 +01:00
Derek Buitenhuis
420806f0d1
Merge commit 'b298b36fc008ad94a24929fe770c8189d96bcac4'
...
* commit 'b298b36fc008ad94a24929fe770c8189d96bcac4':
fate: Only run SRTP test if SRTP code is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 16:02:35 +01:00
Derek Buitenhuis
7e3d3a6a89
Merge commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2'
...
* commit '3ee2ec5ec1e39a438f89302d949c93a1b5d365a2':
unix: Use rw_timeout for setting the connect timeout
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 16:01:50 +01:00
Derek Buitenhuis
ba2d37e9ad
Merge commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0'
...
This commit is a no-op.
* commit '136c3438bbdb56a5d2f1f0f486f180641dc6dda0':
tcp: Use rw_timeout for setting the connect/listen timeouts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 16:01:30 +01:00
Derek Buitenhuis
f8e89d8a29
Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'
...
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1':
avio: Copy URLContext generic options into child URLContexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 15:55:09 +01:00
Derek Buitenhuis
be5fde92ff
libnut: Pass stream to ff_parse_specific_params
...
This function bo longer takes an AVCodecContext.
Fixes ticket #5430 .
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-21 15:21:09 +01:00
Diego Biurrun
a08b5d7b57
build: Silence the lcov-reset target
2016-04-21 14:29:43 +02:00
wm4
656b07b5a9
lavf: use new decode API
...
From Libav commit 8bc4accc37 , with
additional code for decoding subtitles (not present in Libav).
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-21 14:23:36 +02:00
wm4
7fc329e2dd
lavc: introduce a new decoding/encoding API with decoupled input/output
...
Until now, the decoding API was restricted to outputting 0 or 1 frames
per input packet. It also enforces a somewhat rigid dataflow in general.
This new API seeks to relax these restrictions by decoupling input and
output. Instead of doing a single call on each decode step, which may
consume the packet and may produce output, the new API requires the user
to send input first, and then ask for output.
For now, there are no codecs supporting this API. The API can work with
codecs using the old API, and most code added here is to make them
interoperate. The reverse is not possible, although for audio it might.
From Libav commit 05f66706d1 .
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-21 14:23:36 +02:00
Michael Niedermayer
a0b92788a8
avformat/utils: Remove use of caps_internal as it is not public API
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-21 13:49:32 +02:00
Michael Niedermayer
0de99ab06f
avcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()
...
With this the use of the caps_internal from libavformat can be avoided
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-21 13:49:32 +02:00
Martin Storsjö
75b90ef722
libavformat: Update the comment about AVOutputFormat flags
...
Add a flag which applies here, which had been missed.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-21 11:20:46 +03:00
Martin Storsjö
74383def8f
movenc: Handle pts == NOPTS when autoflushing
...
This muxer generally handles pts == NOPTS by using dts instead;
do this for consistency here as well.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-21 11:20:39 +03:00
Michael Niedermayer
9f36ea57ae
avcodec/avpacket: Fix off by 5 error
...
Fixes out of array read
Fixes: mozilla bug 1266129
Found-by: Tyson Smith
Tested-by: Tyson Smith
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-21 00:52:40 +02:00
Paul B Mahol
38797a8033
avcodec/takdec: add code that got somehow lost in process of REing
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-20 22:47:09 +02:00
Anton Mitrofanov
e428f3b30c
x86inc: Enable AVX emulation in additional cases
...
Allows emulation to work when dst is equal to src2 as long as the
instruction is commutative, e.g. `addps m0, m1, m0`.
2016-04-20 19:16:22 +02:00
Anton Mitrofanov
4bd5583ace
x86inc: Improve handling of %ifid with multi-token parameters
...
The yasm/nasm preprocessor only checks the first token, which means that
parameters such as `dword [rax]` are treated as identifiers, which is
generally not what we want.
2016-04-20 19:16:22 +02:00
Anton Mitrofanov
42be240ad6
x86inc: Fix AVX emulation of some instructions
2016-04-20 19:16:22 +02:00
Henrik Gramner
8dd3ee9ddd
x86inc: Fix AVX emulation of scalar float instructions
...
Those instructions are not commutative since they only change the first
element in the vector and leave the rest unmodified.
2016-04-20 19:16:22 +02:00
Tobias Rapp
ef59c6f7e8
fate: add readvitc filter test
...
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-20 18:08:17 +02:00
Michael Niedermayer
9a6ae7fbb2
fate: Add test for ticket 1833 (Ogg/Vorbis Chapters)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-20 01:41:44 +02:00
Petru Rares Sincraian
0b32aff83d
fate: Add test for mts2 (mss4) codec
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-20 00:02:30 +02:00
Martin Storsjö
0abb07bad7
movenc: Update a comment to reflect how the code actually behaves
...
This codepath isn't quite as bad as it used to sound, if fragments
are cut automatically at video packets.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-19 22:43:00 +03:00
Luca Barbato
79fdbfdb3e
img2enc: Refactor the atomic renaming code
...
And use it for the separate-plane side-feature as well.
Bug-Id: 935
2016-04-19 20:30:48 +02:00
Luca Barbato
f3fdef108e
ape: Avoid undefined behaviour
...
Avoid the clang warning
"warning: shifting a negative signed value is undefined"
2016-04-19 20:22:31 +02:00
Derek Buitenhuis
e344646c80
Merge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'
...
* commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0':
opt: Add av_opt_copy()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-19 19:19:53 +01:00
Luca Barbato
6b2ad3ca48
indeo3: Avoid undefined behaviour
...
Avoid the clang warning
"warning: shifting a negative signed value is undefined"
2016-04-19 19:00:41 +02:00
Derek Buitenhuis
eae2ebded3
libxvid: Create extradata in init using a dummy frame
...
Modifying global header extradata in encode_frame is an API violation
and only happens to work currently because mov writes its header
at the end of the file.
Heavily based off of a patch from 2012 by Nicolas George.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-04-19 19:00:41 +02:00
Derek Buitenhuis
c54d835e2f
Merge commit '8833f1508b7b6afc3172a8017934a7a54428c686'
...
This commit is a no-op.
* commit '8833f1508b7b6afc3172a8017934a7a54428c686':
opt: Add const to av_opt_next
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-19 14:43:23 +01:00
Derek Buitenhuis
90eb249969
Merge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'
...
* commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310':
file: Add an option for following a file that is being written
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-19 14:41:19 +01:00
Thomas Guillem
785bfb1d7b
pixfmt: fix wrong comment
...
The h264/hevc Annex E colour primaries table says that AVCOL_SPC_SMPTE170M is
similar than AVCOL_SPC_SMPTE240M. These two values are not similar than
AVCOL_SPC_BT470BG.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-19 13:38:29 +02:00
Anton Khirnov
06edef3d5e
Generate the lists of enabled protocols/bsfs from configure.
2016-04-19 13:34:07 +02:00
Paul B Mahol
13406b6124
avcodec/tak_parser: fix parsing of streams with bunch of small frames at end
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-18 23:37:41 +02:00
Petru Rares Sincraian
f25367f4b4
fate: Add test for 012v codec
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-18 22:43:58 +02:00
Petru Rares Sincraian
849e55e58e
fate: Add test for mss1 codec
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-18 17:33:48 +02:00
Derek Buitenhuis
299d4f9428
Merge commit 'ccea588f831906084b8c8235222920e6984beb72'
...
* commit 'ccea588f831906084b8c8235222920e6984beb72':
avio: Add an option 'rw_timeout'
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-18 15:47:54 +01:00
Derek Buitenhuis
4eef36a4f6
Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'
...
* commit 'd44f3e4059506a182f59218b1e967d42b01e097c':
avio: Apply avoptions on the URLContext itself as well
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-18 15:35:12 +01:00
Derek Buitenhuis
94e5f0922b
Merge commit '8a02a8031ef4f98faf5647f0e01a8922247bf748'
...
* commit '8a02a8031ef4f98faf5647f0e01a8922247bf748':
lavfi: add an NVIDIA NPP-based scaling filter
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-18 15:34:04 +01:00
Derek Buitenhuis
34245eccaf
Merge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'
...
* commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d':
lavf: VAAPI scale filter
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-18 15:22:24 +01:00
Derek Buitenhuis
528af33b6f
Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'
...
This commit is a no-op. wm4 is working to get these into ffmpeg
proper, with ffmpeg versions of the patches.
* commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1':
lavf: use new decode API
avconv: use new encode API
avconv: use new decode API
lavc: introduce a new decoding/encoding API with decoupled input/output
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-18 15:13:28 +01:00
Derek Buitenhuis
1be5509fbb
Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'
...
These commits are no-ops. Not going to merge these since our opt
tests are more complex, and have several blocks with different
options.
* commit '0d2fcdb1c5c9e844c232e5429130727121990d0e':
opt-test: Merge struct declaration and initialization
opt-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-18 15:00:18 +01:00
Michael Niedermayer
ce18e48aec
avcodec/dump_extradata_bsf: Add back 'k' and 'e' options
...
broken since af9cac1be1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-18 02:54:33 +02:00
Michael Niedermayer
57fc93ecb2
avcodec/remove_extradata_bsf: Add back 'k' and 'e' options
...
broken since af9cac1be1
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-18 02:54:27 +02:00
Michael Niedermayer
8106479503
avcodec/bitstream_filter: Fix initializing options from the argument string
...
Fixes ffmpeg ... -vbsf noise=234 ...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-18 02:48:44 +02:00
Michael Niedermayer
76d0209db4
avcodec/intrax8: Remove duplicated chunk from ba5bcf9612
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-18 00:59:18 +02:00
Carl Eugen Hoyos
db7d0d6e7c
lavc/fic: Cosmetics, fix a typo.
...
Found by Moritz Barsnick
2016-04-18 00:18:54 +02:00
Thilo Borgmann
37a4d3383f
lavfi/perspective: Add basic timeline editing.
...
Add number of input and output frames to possible variables.
Add option eval to reevaluate coordinate expressions during
initialization or for every frame.
2016-04-17 21:12:34 +02:00
Derek Buitenhuis
d97a61a8f1
Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'
...
This commit is a no-op.
* commit 'a84713e70d06238100cb0f867ad6031c272054b0':
parseutils-test: Move some variable declarations to avoid block braces
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:46:01 +01:00
Carl Eugen Hoyos
1106a2c5dd
lavc/webp: Print a warning for unsupported chunks.
2016-04-17 20:42:10 +02:00
Derek Buitenhuis
4b23a8137f
Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'
...
* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7':
des-test: Move a variable declaration to avoid an ifdef
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:40:53 +01:00
Derek Buitenhuis
8f540b8612
Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'
...
* commit '65a802401c6cc136576bb2e613c0577cbf622aa8':
build: Add component for the SRTP common code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:39:57 +01:00
Derek Buitenhuis
9b36f446ac
Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'
...
* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4':
timefilter-test: Only compile timefilter-test if JACK is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:37:54 +01:00
Derek Buitenhuis
b0c75963c8
Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'
...
* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7':
doc: Update paths to match new examples location
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:36:59 +01:00
Derek Buitenhuis
9d4799c247
Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'
...
* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a':
Move const qualifier before type name
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:35:03 +01:00
Derek Buitenhuis
61400a1dc7
Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'
...
* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59':
vc1dec: wmv2dec: Validate ff_intrax8_common_init return value
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:32:26 +01:00
Derek Buitenhuis
f64b53f2bf
Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'
...
* commit '0372e73f917e72c40b09270f771046fc142be4a7':
intrax8: Check and propagate errors from ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:31:32 +01:00
Derek Buitenhuis
c29ac4abb8
Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'
...
* commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345':
intrax8: Move documentation from implementation to header file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:30:01 +01:00
Derek Buitenhuis
ba5bcf9612
Merge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'
...
* commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950':
intrax8: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:27:53 +01:00
Derek Buitenhuis
7120bff0a3
Merge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'
...
* commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13':
intrax8: Adjust printf conversion specifier for sizeof expression
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:13:30 +01:00
Derek Buitenhuis
2c3e38f44f
Merge commit '42244ce07a1f4f5108ae86d50fe72db785d483ed'
...
* commit '42244ce07a1f4f5108ae86d50fe72db785d483ed':
intrax8: Move a comment to the place it corresponds
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:11:43 +01:00
Derek Buitenhuis
e445b80c74
Merge commit '750562549ceef268b29b94f6a887d9cf331a8c78'
...
* commit '750562549ceef268b29b94f6a887d9cf331a8c78':
intrax8: Wrap multiline macros in do{}while(0) clauses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:11:17 +01:00
Derek Buitenhuis
909f5e7100
Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'
...
* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4':
intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:09:12 +01:00
Derek Buitenhuis
dff9894acd
Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'
...
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc':
nuv: Use the correct context for av_image_check_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 19:06:18 +01:00
Derek Buitenhuis
d9357332ae
Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'
...
* commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a':
indeo4: Consistently initialize variables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 18:53:11 +01:00
Derek Buitenhuis
1117d6f4b1
Merge commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721'
...
* commit '6202e2fede75df92cbc374a3f7d6893d0c5ac721':
indeo4: Rework stream analysis report
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 18:51:58 +01:00
Derek Buitenhuis
98e3153fa3
Merge commit '4426540f0c3ee516662f79d0a6ab5b95503b6611'
...
This commit is a no-op. We will do this when we convert ffmpeg.c
* commit '4426540f0c3ee516662f79d0a6ab5b95503b6611':
avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 18:50:11 +01:00
Derek Buitenhuis
af9cac1be1
Merge commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab'
...
* commit '33d18982fa03feb061c8f744a4f0a9175c1f63ab':
lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com >
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com >
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-17 18:47:40 +01:00
Michael Niedermayer
6d160afab2
avfilter/vf_readvitc: Use avpriv_frame_get_metadatap() avoid direct access to AVFrame.metadata (to comply to API)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-17 18:21:42 +02:00
Ronald S. Bultje
ee729cc0ed
vp9: ignore frame_context_index field in key-/intraonly-frames.
...
Reproduces a bug to remain consistent with libvpx' behaviour.
2016-04-17 09:28:56 -04:00
Ronald S. Bultje
6135aed0d2
vf_scale: support bt2020 in in/out_color_matrix properties.
2016-04-17 09:28:30 -04:00
Michael Niedermayer
c8d95e5ceb
avfilter/colorspacedsp_template: Add argument protecting () to avg()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-17 13:17:18 +02:00
Paul B Mahol
7a0aee1688
avcodec/takdec: fix decoding of some sample rates with multichannel coder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-17 11:30:56 +02:00
Ivan
3a727606c4
avcodec/h264: Fix for H.264 configuration parsing
...
Sometimes video fails to decode if H.264 configuration changes mid stream.
The reason is that configuration parser assumes that nal_ref_idc is equal to 11b
while actually some codecs but 01b there. The H.264 spec is somewhat
vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-17 02:39:36 +02:00
James Almer
b63ba3a517
avformat/hashenc: add missing avio_flush to hash_write_trailer
...
It was accidentally deleted in the previous hashenc commit
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-16 21:31:58 -03:00
Michael Niedermayer
487c346d98
avcodec/exr: Fix "libavcodec/exr.c:1494:13: warning: ISO C90 forbids mixed declarations and code"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-17 01:52:26 +02:00
Michael Niedermayer
618032da0d
fate: add test for Ticket4816 (PNG decoding with alpha)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-17 01:16:19 +02:00
Rostislav Pehlivanov
9e138c4813
vc2enc: use 32x16 slices by default
...
Approximately 1.25 times faster than 64x32, visually and
statistically improves quality.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-04-16 23:59:36 +01:00
Rostislav Pehlivanov
77fb7177af
vc2enc: don't require interlacing for 1080p50/60 base video formats
...
Typo
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-04-16 23:59:36 +01:00
Tobias Rapp
2aad631a81
avfilter: add readvitc filter
...
Add a filter to scan the top lines of video frames for vertical interval
timecode (VITC) information and attach it as metadata keys.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
2016-04-16 16:22:43 +02:00
Michael Niedermayer
60517c3ad6
avfilter/af_hdcd: Fix informations typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-16 02:01:10 +02:00
Michael Niedermayer
c4fad02779
avformat/matroskaenc: Undo bits_per_coded_sample change as bits_per_raw_sample is available again
...
Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-16 02:01:10 +02:00
Carl Eugen Hoyos
a676c29af5
lavf/bink: Cosmetics: Reindent after last commit.
2016-04-15 21:26:04 +02:00
Carl Eugen Hoyos
6d39132fd4
lavf/bink: Support Monkey Island 4 (SMUSH) files.
...
Fixes ticket #5410 .
2016-04-15 21:22:10 +02:00
Carl Eugen Hoyos
139cbeb75e
lavc/dds: Fix GRAY8A decoding.
...
Fixes ticket #4667 .
2016-04-15 21:06:34 +02:00
Michael Niedermayer
f07923253a
avcodec/avcodec: Document signed/unsignedness of sample formats in relation to bits_per_raw_sample
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-15 17:58:05 +02:00
Michael Niedermayer
bcf936eaea
avcodec/utils: Add braces to framecount computation
...
Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-15 15:48:02 +02:00
Michael Niedermayer
a7fa1e38ca
avcodec/utils: Fix duration of ATRAC3 packets
...
Fixes ticket1680
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-15 15:03:27 +02:00
Benjamin Steffes
0cfe16437f
lavfi/af_hdcd: Implement high definition audio cd filtering.
...
Fixes ticket #4441 .
2016-04-15 12:14:55 +02:00
Anton Khirnov
a0f469da74
hwcontext: initialize sw_format in av_hwframe_ctx_alloc()
2016-04-15 10:15:54 +02:00
Anton Khirnov
5e1a3ea3ba
lavc: move the vaapi encoders further down in the list of codecs
...
Right now they are the first encoders for those codecs in the list, so
they are selected when the caller requests a codec by id.
Since they require special treatment, they should not be selected by
default if there are other encoders (e.g. libx264/5) available.
2016-04-15 10:10:57 +02:00
Mark Thompson
92fdea3747
vaapi_h265: Add -qp option, use it to replace use of -global_quality
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-15 10:07:05 +02:00
Mark Thompson
f70e462793
vaapi_h265: Add constant-bitrate encode support
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-15 10:07:05 +02:00
Mark Thompson
fcf536b130
vaapi_h264: Add encode quality option (for quality-speed tradeoff)
...
Only supported on VAAPI 0.36 and higher.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-15 10:07:05 +02:00
Mark Thompson
9629701ce9
vaapi_h264: Add -qp option, use it to replace use of -global_quality
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-15 10:07:05 +02:00
Mark Thompson
69b06ed428
vaapi_encode: Add support for codec-local options
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-15 10:07:05 +02:00
Mark Thompson
6e8f66fc93
vaapi_h264: Add constant-bitrate encode support
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-15 10:07:05 +02:00
Mark Thompson
f6b8552369
vaapi_encode: Refactor slightly to allow easier setting of global options
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-04-15 10:07:04 +02:00
Anton Khirnov
18019f8cb9
FATE: add an H.264 test with unescaped extradata
...
See commit a7829a2
2016-04-15 10:06:39 +02:00
Anton Khirnov
d7abe900c3
FATE: add an H.264 test with invalid reference lists
...
See commit 9d74012
2016-04-15 10:04:52 +02:00
James Almer
bb505cd505
avformat/hashenc: simplify hash_write_trailer
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-14 20:59:08 -03:00
Michael Niedermayer
21acc4db5f
avcodec: Add bits_per_raw_sample to AVCodecParameters
...
The bits_per_raw_sample represents the number of bits of precision per sample.
The field is added at the logical place, not at the end as the code was just
recently added
This fixes the regression about losing the audio sample precision information
The change in the fate test checksum un-does the change from the merge
Previous version reviewed by: wm4 <nfxjfg@googlemail.com >
Previous version reviewed by: Dominik 'Rathann' Mierzejewski <dominik@greysector.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-15 00:33:55 +02:00
James Almer
c8ed93efcf
avformat/yop: alloc codecpar extradata only once
...
Fixes memleak
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-14 15:55:10 -03:00
Paul B Mahol
9cd2ca9966
avcodec/ralf: add support for mono
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-14 22:31:57 +02:00
Paul B Mahol
c9fb81ff41
avcodec/atrac3: pass AVCodecContext to av_log if available
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-14 18:47:57 +02:00
Paul B Mahol
323b8c95e4
avformat: add AVFormatContext to ff_get_extradata()
...
Needed for av_log() inside that function.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-14 18:21:08 +02:00
Michael Niedermayer
8e26bdd59b
avcodec/bmp_parser: Ensure remaining_size is not too small in startcode packet crossing corner case
...
Fixes Ticket 5438
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-14 15:28:02 +02:00
Derek Buitenhuis
e1a8f7818c
Merge commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b'
...
This commit is a no-op.
* commit 'a2d1922bde8db2cdac95051918fe81ae18c0376b':
takdec: ensure chan2 is a valid channel index
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-14 14:02:21 +01:00
Derek Buitenhuis
0520d573db
Merge commit '9765549f551ff40869aee1a6492b6a976c86cfe9'
...
* commit '9765549f551ff40869aee1a6492b6a976c86cfe9':
mpegts: Forward the errors on mpeg4 objects parsing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-14 14:01:31 +01:00
Derek Buitenhuis
8688d3af39
Merge commit '07a844f32ebb78503981df017fa3ebfedb75fe1c'
...
* commit '07a844f32ebb78503981df017fa3ebfedb75fe1c':
lavfi: generic hardware surface upload and download filters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-14 13:59:45 +01:00
Derek Buitenhuis
28abb216cb
Merge commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4'
...
* commit '551c6775abb5e0ad34c26d7e23bc6fbbe8ccc9d4':
lavu: VAAPI hwcontext implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-14 13:49:55 +01:00
Derek Buitenhuis
eb2da769bd
Merge commit 'd264c720f7b74286840719e506daba39f83b438b'
...
* commit 'd264c720f7b74286840719e506daba39f83b438b':
lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-14 13:46:00 +01:00
Derek Buitenhuis
afccfaf26a
Merge commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09'
...
* commit 'b1f01e85a92d401a9b29c79f23db36b7685e8c09':
lavu: add a way to query hwcontext frame constraints
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-14 13:33:37 +01:00
Derek Buitenhuis
7af788aa62
Merge commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5'
...
* commit '1098f5c0495c61a98d4ff6b8e24c17974d4bace5':
svq3: Use a separate buffer for decoding the slices
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-14 13:25:33 +01:00
James Almer
0efafc5849
avformat/framehash: enable new output
...
Also, make every addition except for sidedata part of version 1 instead of the
new version 2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-13 21:13:21 -03:00
James Almer
868bce48f6
avformat/framehash: add sidedata checksum
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-13 20:58:04 -03:00
Jan Sebechlebsky
2ea5ab6fc6
avformat/tee: Refactor close_slaves function in tee muxer
...
Closing single slave operation is pulled out into separate
function close_slave(TeeSlave*).
Both close_slave and close_slaves function are moved before
open_slave function.
Reviewed-by: Nicolas George <george@nsup.org >
Signed-off-by: Jan Sebechlebsky <sebechlebskyjan@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-04-14 00:49:11 +02:00
Bryan Huh
949444348b
avformat/dump: Fix sign bug in reported "start" time
...
Previously, the bug was that if -1 < start_time < 0, the reported
"start" time would lose the negative-sign.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-14 00:13:15 +02:00
Paul B Mahol
56759f69a6
avcodec/wmalosslessdec: improve 24bit support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-13 22:56:53 +02:00
Paul B Mahol
5ac71e9db8
avcodec/wmalosslessdec: improve >2 channel support
...
Before it worked for stereo files only.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-13 22:56:33 +02:00
Michael Niedermayer
3c0511f29e
tests/checkasm/vf_colorspace: Make bpp_mask const
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-13 22:39:41 +02:00
Lou Logan
fa0f59d55d
doc/demuxers: fix "Quicktme" typo
...
Signed-off-by: Lou Logan <lou@lrcd.com >
Found-by: furq
2016-04-13 10:41:42 -08:00
James Almer
5557e881c9
avformat/framehash: add extradata checksum
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-13 11:41:20 -03:00
James Almer
33aa8a6221
avformat/framecrc: enable new output
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-13 11:37:14 -03:00
Derek Buitenhuis
89ec4d46ee
Merge commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361'
...
This commit is a no-op.
* commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361':
cmdutils: update copyright year to 2016
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:35:40 +01:00
Derek Buitenhuis
e5bb7d98f8
Merge commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d'
...
This commit is a no-op.
* commit '8b4b1c1eea9daa4e2003aa0935e73f56aab8102d':
matroska: Support V_QUICKTIME as written in the specification
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:34:16 +01:00
Derek Buitenhuis
c182845068
Merge commit '92c1a83ee9394b39d68f6affd9104752a03714f8'
...
* commit '92c1a83ee9394b39d68f6affd9104752a03714f8':
qsv: Fix loading multiple plugins
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:31:36 +01:00
Derek Buitenhuis
bdd6275691
Merge commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328'
...
* commit '7e01d48cfd168c3dfc663f03a3b6a98e0ecba328':
mov: Check the entries value when parsing dref boxes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:30:47 +01:00
Derek Buitenhuis
37f4cdb937
Merge commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0'
...
* commit '59b9d2f684f1ff66627ca2b7d2dd05771ade62f0':
configure: Add support for clang llvm-cov
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:29:10 +01:00
Derek Buitenhuis
6e6b1fe7f7
Merge commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2'
...
* commit 'c11a8586264520e6afcddc52156f4a1fd2fb07b2':
configure: Support msan as toolchain
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:28:44 +01:00
Derek Buitenhuis
c849ed8b2f
Merge commit '328e9a15c568843580ff3ff490748d545f16def8'
...
* commit '328e9a15c568843580ff3ff490748d545f16def8':
buffer: drop a reference to a non-existing function from the docs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:27:01 +01:00
Derek Buitenhuis
27558679a1
Merge commit '7480d001312d9ba706333ec970264ed9df3f82cb'
...
* commit '7480d001312d9ba706333ec970264ed9df3f82cb':
pixfmt: fix the AV_PIX_FMT_VAAPI_VLD doxy
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:26:08 +01:00
Derek Buitenhuis
2691a8399f
Revert "Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'"
...
Broke a lot of stuff and didn't fix anything.
This reverts commit 3c461eecd4 , reversing
changes made to 884dd175f0 .
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 17:11:10 +01:00
Derek Buitenhuis
f8b09e90e9
Merge commit '39a2d3288e82e4e576c03efb32179ef5a19fff50'
...
This commit is a no-op. Ours are not identical / refactorable.
* commit '39a2d3288e82e4e576c03efb32179ef5a19fff50':
mpegvideo: Refactor emulated_edge_mc calls
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:31:35 +01:00
Derek Buitenhuis
d3e1c6f975
Merge commit '0242351390643d176b10600c2eb854414f9559e6'
...
* commit '0242351390643d176b10600c2eb854414f9559e6':
mpegvideo: Fix undefined negative shifts in mpeg_motion_internal
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:29:12 +01:00
Derek Buitenhuis
c2f9f81650
Merge commit '7d4a1ff344cbf969ac648642a0fd8484fd5b8637'
...
This commit is a no-op. We solved it already.
* commit '7d4a1ff344cbf969ac648642a0fd8484fd5b8637':
mpegvideo: Fix undefined negative shifts in ff_init_block_index
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:27:32 +01:00
Derek Buitenhuis
eff2b43117
Merge commit '1389b4c18d1042c196603ba66c25113bcee1738b'
...
This commit is a no-op.
* commit '1389b4c18d1042c196603ba66c25113bcee1738b':
idct8x8: Fix undefined negative shifts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:25:22 +01:00
Derek Buitenhuis
09dc684566
Merge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'
...
* commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0':
vdpau: Add missing deprecation guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:22:14 +01:00
Derek Buitenhuis
feb1f7abc5
Merge commit 'd40cb726d271b0284642a1ba159eb26a5c579f77'
...
* commit 'd40cb726d271b0284642a1ba159eb26a5c579f77':
mov: Trim dref absolute path
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:21:12 +01:00
Derek Buitenhuis
e7ac968f60
Merge commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838'
...
This commit is a no-op.
[16:15] <@Daemon404> wm4, ping
[16:15] <@Daemon404> whats up with "avconv: remove sub-frame warning"
[16:15] <@Daemon404> it's in libav but not ours?
[16:15] <@Daemon404> mailing list bikeshedding?
[16:15] <@wm4> it's in ffmpeg.c too
[16:16] <@wm4> you can probably skip it for now
[16:16] <@wm4> michaelni was against removing it this way
[16:17] <@Daemon404> ok
* commit '0b6e5d6b32b91c6da79cd919a3c2ede9d682f838':
avconv: remove sub-frame warning
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:17:23 +01:00
Derek Buitenhuis
f5b93c46e9
Merge commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874'
...
This commit is a no-op.
* commit '2e2f8534ebde47d3a3909fe64c2e66204bc56874':
lavc: factor apply_param_change() AV_EF_EXPLODE handling
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:14:42 +01:00
Derek Buitenhuis
be6b58a981
Merge commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71'
...
* commit '7a6cf2771414c7ab8bca0811d589f6091a6e2b71':
lavu: improve documentation of some AVFrame functions
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:11:39 +01:00
Derek Buitenhuis
3bf368a2a6
Merge commit '84b5dcf27589b32713a4ba0723a129156b4d2408'
...
This commit is a no-op.
* commit '84b5dcf27589b32713a4ba0723a129156b4d2408':
asfenc: remove an unused variable
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:10:10 +01:00
Derek Buitenhuis
bfd0f42277
Merge commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90'
...
This commit is a no-op. As far as I can tell, we already added
checks, to address this CVE in 7c0b84d899 ,
which is also reflected in the CVE database:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-2326
* commit 'ff3db937ef3aa30046a3936146f86ad48ee2ff90':
asfenc: fix some possible integer overflows
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 16:08:44 +01:00
Derek Buitenhuis
3c461eecd4
Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'
...
* commit '1ceb07eb313c2d51383408025e57a2fe50ccd164':
avformat_find_stream_info: move duration guessing after updating codec parameters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 15:36:55 +01:00
Derek Buitenhuis
884dd175f0
Merge commit '11843ededacd0157aea642771837557549b5b417'
...
* commit '11843ededacd0157aea642771837557549b5b417':
fate: Add separate target for all indeo3 tests
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 15:20:53 +01:00
Derek Buitenhuis
622f18a2bf
Merge commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d'
...
* commit 'b39ab8549a53e2fc7978ab9db50e5c2ba6a6602d':
fate: Add test for indeo2 with delta frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 14:39:23 +01:00
Derek Buitenhuis
78af369189
Merge commit 'f8c34f4b8d62afad3f63cf3d9617d73735bef8c1'
...
This commit is a no-op. They rewrote fixes we already did,
to the character.
* commit 'f8c34f4b8d62afad3f63cf3d9617d73735bef8c1':
indeo2: Fix banding artefacts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 14:37:46 +01:00
Derek Buitenhuis
6b1a0f2058
Merge commit 'd4066a702407352a0648af882c34ea81a404fa2b'
...
This commit is a no-op. Ours is already formatted the same.
* commit 'd4066a702407352a0648af882c34ea81a404fa2b':
indeo2data: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 14:36:22 +01:00
Derek Buitenhuis
546bf316ca
Merge commit '1a094af638281295bf087945923d258b5acd1ab1'
...
This commit is a no-op. The value of the refactoring is dubious and
merging it is error prone. If someone feels strongly about merging it,
let me know, and I will.
* commit '1a094af638281295bf087945923d258b5acd1ab1':
fft: Split MDCT bits off from FFT
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-13 14:32:19 +01:00
Rodger Combs
c890bcbacf
lavf/audiotoolboxdec: only provide block alignment for ILBC
...
Fixes decode errors for some AVI files
2016-04-13 03:27:29 -05:00
Rodger Combs
c11157c09a
lavf/audiotoolboxdec: only send extradata for formats that use it
...
Fixes initialization errors for some AVI files
2016-04-13 03:27:29 -05:00
Rodger Combs
acd5910e39
lavc/audiotoolboxdec: reindent
2016-04-13 03:27:29 -05:00
Rodger Combs
b20d3bf4a4
lavc/audiotoolboxdec: avoid relying on consumer-provided params when possible
2016-04-13 03:27:29 -05:00
Tobias Rapp
ee104580c5
avfilter/vf_drawtext: add optional default value to metadata function
...
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com >
2016-04-13 08:39:07 +02:00
James Almer
3674a53d17
avformat/uncodedframecrc: fix incompatible pointer type warning
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-13 01:39:59 -03:00
Michael Niedermayer
4d59d075a9
tests/checkasm/vf_colorspace: Fix dst array sizes
...
Suggested & Approved by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-12 23:46:52 +02:00
Marton Balint
ee94b1a50a
ffplay: convert to codecpar
...
Tested-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-04-12 23:41:15 +02:00
Yuuki Galaxy
af5419f91b
libavfilter/vf_owdenoise.c: skip processing when strength is 0
...
It is practical to de-noise only on luma while keeping chroma unchanged.
However, libavfilter/vf_owdenoise.c always do the Wavelet transform/retransform on all 3 channels without check whether chroma_strength is 0.
Thus I make this patch. De-noise on Y only for yuv420 is now 1.5 times faster.
Signed-off-by: Yuuki Galaxy <galaxy001@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-12 22:57:32 +02:00
Martin Vignali
ac07e57c39
avcodec/exr: fix huf_decode
2016-04-12 22:54:56 +02:00
Paul B Mahol
392b0a25c2
avcodec/exr: fix clearing end of bitmap
...
Inspired by patch from Martin Vignali.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-12 22:54:56 +02:00
Ronald S. Bultje
5ce703a6bf
vf_colorspace: x86-64 SIMD (SSE2) optimizations.
2016-04-12 16:42:48 -04:00
Ronald S. Bultje
2e2e08a35b
lavfi: new colorspace conversion filter.
...
The intent here is similar to colormatrix, but it's LGPLv2.1-or-later
(instead of GPLv2.0) and supports gamma/chromaticity correction.
2016-04-12 16:42:45 -04:00
James Almer
d7815df402
arm/rdft_init: fix license header
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-12 15:01:19 -03:00
Michael Niedermayer
e3111b1ff8
avformat/framehash: Add more information to the output
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-12 11:18:57 -03:00
Moritz Barsnick
f4a0236cbd
avformat: add hash and framehash muxers
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-12 11:18:52 -03:00
Derek Buitenhuis
e8373143e1
ffprobe: Don't try and decode things that have no dec_ctx
...
The last instance of a missing dec_ctx check from the merge.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 17:24:07 +01:00
Derek Buitenhuis
9cb1ed5735
ffprobe: Fix missing dec_ctx check
...
Missed it during the merge of ffprobe codecpar conversion.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 16:50:01 +01:00
Derek Buitenhuis
aa9517583e
Merge commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716'
...
This commit is a no-op.
* commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716':
sdp: fix opus sprop-stereo fmtp syntax
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:59:41 +01:00
Derek Buitenhuis
05e4783c29
Merge commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83'
...
* commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83':
fate: fft: Split DCT/FFT/MDCT/RDFT tests into separate targets
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:58:15 +01:00
Derek Buitenhuis
2605967f7e
Merge commit '4c297249ac0f513a610a62691ce96d6b62f65b94'
...
* commit '4c297249ac0f513a610a62691ce96d6b62f65b94':
rdft: arm: Split RDFT initialization into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:43:34 +01:00
Derek Buitenhuis
197fa698c6
Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555'
...
* commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555':
fft: arm: Drop unnecessary #include, add missing ones
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:43:09 +01:00
Derek Buitenhuis
d496d52d02
Merge commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622'
...
* commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622':
fft: x86: cosmetics: Drop silly comments, add comment, whitespace
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:42:21 +01:00
Derek Buitenhuis
6e2ca81485
Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd'
...
* commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd':
qsv: Move down the implementation query
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:41:46 +01:00
Derek Buitenhuis
9a98ddcf1b
Merge commit 'dbb43b8b83b097585ec255ec638b61e359ebea77'
...
* commit 'dbb43b8b83b097585ec255ec638b61e359ebea77':
avpacket: properly reset data/size in av_packet_move_ref()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:39:10 +01:00
Derek Buitenhuis
9080dc7f07
Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475'
...
* commit 'ba357e98691ee4fe1a503b8830c0050be4127475':
avprobe: switch to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-12 15:38:03 +01:00
Martin Storsjö
9d4d9be538
libavcodec: Document that encoders may use the framerate field in AVCodecContext
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-12 14:20:25 +03:00
Martin Storsjö
1bb56abb9b
omx: Add support for zerocopy input of frames
...
This can only be used if the input data happens to be laid out
exactly correctly.
This might not be supported on all encoders, so only enable it
with an option, but enable it automatically on raspberry pi,
where it is known to be supported.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-12 13:51:01 +03:00
Martin Storsjö
f1cd9b03f3
omx: Add support for broadcom OMX on raspberry pi
...
The raspberry pi uses the alternative API/ABI for OMX; this makes
such builds incompatible with all the normal OpenMAX implementations.
Since this can't easily be detected at configure time (one can
build for raspberry pi's OMX just fine using the generic, pristine
Khronos OpenMAX IL headers, no need for their own extensions),
require a separate configure switch for it instead.
The broadcom host library can't be unloaded once loaded and started;
the deinit function that it provides is a no-op, and after started,
it has got background threads running, so dlclosing it makes it
crash.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-12 13:50:59 +03:00
Martin Storsjö
e8919ec486
libavcodec: Add H264/MPEG4 encoders based on OpenMAX IL
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-12 13:50:57 +03:00
Martin Storsjö
b8e899f4bf
mmaldec: Use imgutils.h for copying frames
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-12 13:50:54 +03:00
Paul B Mahol
9149e9c0ba
avcodec/apedec: fix decoding of stereo files with one channel full of silence
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-12 11:03:48 +02:00
Michael Niedermayer
196cfc278d
avformat/utils: use av_codec_g/set_lowres()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-12 04:21:12 +02:00
Timo Rothenpieler
901b0f1a21
avformat/concatdec: Use correct stream count on close
2016-04-11 21:06:10 +02:00
Lou Logan
03d8fee912
doc/filters: document testsrc2 source filter
...
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-04-11 10:26:25 -08:00
Matthieu Bouron
4c22441276
swscale/arm: add yuv2planeX_8_neon
2016-04-11 18:13:36 +02:00
Michael Niedermayer
0c79c96cf2
doc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec flags are not available to the muxer anymore
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-11 17:57:06 +02:00
Derek Buitenhuis
48fb5294d0
Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3'
...
* commit '567d6d5f9d1400f00445183b3477391f58979aa3':
avprobe: add local per-stream state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 16:46:30 +01:00
Derek Buitenhuis
9d48aa6d7d
Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852'
...
* commit 'c9478410c68c04261f9cfcd80474607e50bd1852':
avprobe: add local per-file state
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 16:33:13 +01:00
Derek Buitenhuis
95348174ef
Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b'
...
* commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b':
mpegvideo_enc: use avcodec_free_context() instead of av_free()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 16:02:16 +01:00
Derek Buitenhuis
6614214ece
Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7'
...
* commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7':
avprobe: print information from the codec descriptor
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 16:01:22 +01:00
Derek Buitenhuis
80195236c8
Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd'
...
* commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd':
avprobe: remove a pointless condition and a dead branch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 15:30:55 +01:00
Clément Bœsch
c921f4f687
sws/aarch64: add ff_yuv2planeX_8_neon
2016-04-11 16:27:19 +02:00
Derek Buitenhuis
0dfbca73bb
Merge commit 'dc4983d78af2a666461654067d2e5d45b835358a'
...
This commit is a no-op.
* commit 'dc4983d78af2a666461654067d2e5d45b835358a':
APIchanges: add missing hashes and dates
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 15:10:02 +01:00
Derek Buitenhuis
6586f62d1a
Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc'
...
* commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc':
lavf: add a missing bump and APIchanges for the codecpar switch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 15:09:00 +01:00
Derek Buitenhuis
3dec7ed3cf
Merge commit 'e66fa35392cd45d0a80774cd057fb765d60def43'
...
* commit 'e66fa35392cd45d0a80774cd057fb765d60def43':
vc1dec: Check group allocations separatedly
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 15:06:18 +01:00
Derek Buitenhuis
8cd1323103
Merge commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596'
...
This commit is a no-op. We already did this.
* commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596':
vc1dec: Fix leak on error for array allocations
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 15:03:14 +01:00
Derek Buitenhuis
015ca20030
Merge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f'
...
* commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f':
vc1dec: Properly call deinit function on error
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 15:01:43 +01:00
Derek Buitenhuis
e06f5c6f94
Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380'
...
* commit '35b1cd343cd703c1b0fc926dc43a92141a357380':
vc1dec: Drop commented out cruft
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 15:00:53 +01:00
Derek Buitenhuis
8a1c79024d
Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710'
...
* commit 'fa55addd23c2f168163175aee17adb125c2c0710':
img2: Drop av_ prefix for a static function
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:59:58 +01:00
Derek Buitenhuis
8a6cc30b04
Merge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6'
...
This commit is a no-op.
* commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6':
idct: Only build prores IDCT if ProRes decoder is enabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:58:39 +01:00
Derek Buitenhuis
d30cf57a7b
Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d'
...
* commit '3c53627ac17fc6bdea5029be57da1e03b32d265d':
qsvdec: store the sync point in heap memory
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:56:27 +01:00
Derek Buitenhuis
acc155ac55
Merge commit 'a1335149fd610b16459d9281b611282cac51c950'
...
* commit 'a1335149fd610b16459d9281b611282cac51c950':
qsvenc: store the sync point in heap memory
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:45:57 +01:00
Derek Buitenhuis
8cae006c56
Merge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9'
...
* commit '1138eb5509d3db7f6d565cb45f137a786d22beb9':
vsrc_movie: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:42:30 +01:00
Derek Buitenhuis
6bc5ef37cb
Merge commit 'ac6d53589f3631ae08467c784fb371a15c957f01'
...
* commit 'ac6d53589f3631ae08467c784fb371a15c957f01':
examples/transcode_aac: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:15:28 +01:00
Derek Buitenhuis
030e69b4dc
Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a'
...
* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
examples/qsvdec: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:07:41 +01:00
Derek Buitenhuis
d76972b581
Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7'
...
* commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7':
examples/output: convert to codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-11 14:06:43 +01:00
Martin Storsjö
798845ce7e
testprogs: Add missing libm.h includes
...
This fixes building on MSVC 2010 and 2012 after d12b5b2f13 .
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-04-11 14:48:24 +03:00
Paul B Mahol
b62ed56e25
avcodec/shorten: properly handle bitshift > 31
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-11 13:14:55 +02:00
Michael Niedermayer
15fa01786c
avformat/hdsenc: Pass flags to child context
...
This is needed as the bitexact flag is not in the codecpar context, and thus not copied
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-11 04:34:00 +02:00
Michael Niedermayer
0c9ad94e97
avformat/dashenc: Pass flags to child context
...
This is needed as the bitexact flag is not in the codecpar context, and thus not copied
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-11 04:34:00 +02:00
Michael Niedermayer
4104f18358
avformat/segment: Pass flags to child context
...
This is needed as the bitexact flag is not in the codecpar context, and thus not copied
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-11 04:34:00 +02:00
Michael Niedermayer
02d08da81f
avdevice/caca: switch to codecpar
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-11 01:34:02 +02:00
James Almer
5501f58e52
fate: fix sample dependencies for fate-{a,v}filter tests
2016-04-10 18:31:05 -03:00
Derek Buitenhuis
972df59f4f
Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70'
...
This commit is a no-op. We want to do this ourselves since avplay and
ffplay differ quite a bit.
* commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70':
avplay: convert do codecpar
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-10 21:49:56 +01:00
Derek Buitenhuis
bc91bc1d8b
Merge commit '0705f5960c9d272cef1309c090000865b991c9c7'
...
This commit is a no-op. We did this already in 9e0d1c00b5 .
* commit '0705f5960c9d272cef1309c090000865b991c9c7':
avplay: do not use AVStream.codec for decoding
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com >
2016-04-10 21:49:00 +01:00
Derek Buitenhuis
bbf5ef9dac
Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a'
...
This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.
* commit '15e84ed3f141c586e8cb78ed58365cf5a511108a':
avconv: convert to codecpar
Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com >
2016-04-10 21:47:26 +01:00
Derek Buitenhuis
6372c9dc99
Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d'
...
This commit is a no-op. We already moved it here.
* commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d':
avconv: switch opening decoders and encoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-10 21:29:30 +01:00
Derek Buitenhuis
6f69f7a8bf
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
...
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com >
- Hendrik Leppkes <h.leppkes@gmail.com >
- wm4 <nfxjfg@googlemail.com >
- Clément Bœsch <clement@stupeflix.com >
- James Almer <jamrial@gmail.com >
- Michael Niedermayer <michael@niedermayer.cc >
- Rostislav Pehlivanov <atomnuker@gmail.com >
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-10 20:59:55 +01:00
Jakub Stachowski
60b75186b2
avcodec/wmalosslessdec: do not discard last frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-10 21:33:56 +02:00
Paul B Mahol
571aa7d25e
avcodec/shorten: mark as AV_CODEC_CAP_SUBFRAMES
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-10 19:54:43 +02:00
Martin Vignali
b45d542ea6
fate/exr : add test for PXR24 Float and tile uncompress
2016-04-10 19:47:51 +02:00
Martin Vignali
2dd7b46132
avcodec/exr: fix channel detection
2016-04-10 19:24:15 +02:00
Carl Eugen Hoyos
7e1e25c2dc
lavf/avio: Remove linebreak from https warning.
2016-04-10 15:39:13 +02:00
Michael Niedermayer
38a6242b27
avformat/mpegts: Remove unused argument from analyze()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-10 13:32:26 +02:00
Michael Niedermayer
ee7a642b0e
avformat/mpegts: Check adaption field control in analyze() more instead of transport_error_indicator
...
transport_error_indicator is not required to be 0
Fixes probing
Fixes Ticket 4862
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-10 13:32:25 +02:00
Paul B Mahol
0c90b2e013
avcodec/shorten: add support for AIFF packing, not bitexact
...
Also report unsupported packing.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-09 21:07:10 +02:00
Paul B Mahol
82ee37f1f3
avcodec/shorten: fix decoding of very large (>2048) block sizes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-09 19:51:16 +02:00
Carl Eugen Hoyos
b0c026a27f
lavf/rawenc: Add a raw gsm muxer.
2016-04-09 11:44:50 +02:00
Carl Eugen Hoyos
56cb465b38
lavf/gsmdec: Add raw gsm autodetection.
...
Fixes bug 555.
2016-04-09 11:38:46 +02:00
Michael Niedermayer
d433623fba
avcodec/pngdec: Fix alpha detection with skip_frame
...
Fixes Ticket4816
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-09 01:10:58 +02:00
Matthieu Bouron
7abc8e7ae3
swscale/arm: add ff_hscale_8_to_15_neon
2016-04-09 00:16:56 +02:00
Paul B Mahol
dee138624f
avcodec/shorten: fix decoding of files with number of samples lower than max_frame_size
...
Note that support of very big block sizes is not currently supported at all due
too flawed logic in decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 23:45:09 +02:00
Paul B Mahol
c18fdc8692
avcodec/shorten: remove useless if condition and comment, reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 23:21:47 +02:00
Paul B Mahol
a4790e1890
avformat/nistshperedec: add support for mu-law as sample-byte-format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 22:34:38 +02:00
Paul B Mahol
966d43d778
avcodec/shorten: fix decoding of last frame
...
Previously it would be always discarded.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 22:32:32 +02:00
Michael Niedermayer
6936c11533
fate: Add test for Ticket 2397 (dvdsub)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-08 21:42:57 +02:00
Clément Bœsch
cab9661dba
sws/aarch64/yuv2rgb: honor iOS calling convention
...
y_offset and y_coeff being successive 32-bit integers, they are packed
into 8 bytes instead of 2x8 bytes.
See https://developer.apple.com/library/ios/documentation/Xcode/Conceptual/iPhoneOSABIReference/Articles/ARM64FunctionCallingConventions.html
> iOS diverges from Procedure Call Standard for the ARM 64-bit
> Architecture in several ways
[...]
> In the generic procedure call standard, all function arguments passed
> on the stack consume slots in multiples of 8 bytes. In iOS, this
> requirement is dropped, and values consume only the space required.
[...]
> Padding is still inserted on the stack to satisfy arguments’ alignment
> requirements.
2016-04-08 17:58:43 +02:00
Paul B Mahol
259879d32d
avformat/nistspheredec: fix silly bug
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 13:19:00 +02:00
Paul B Mahol
1490682bcb
avcodec/pngenc: check return value of av_frame_copy()
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 12:45:40 +02:00
Dmitriy
c3320a51df
avcodec/pngenc: restore image size before copying frame
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 12:37:20 +02:00
Paul B Mahol
ae8a13c560
avcodec/shorten: if allocation fails reset max_frame_size
...
Otherwise crash happens.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 09:59:05 +02:00
Paul B Mahol
3e99b377fc
avcodec: remove "get_buffer() failed" message
...
It is already provided by ff_get_buffer().
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-08 09:40:32 +02:00
Paul B Mahol
0c9490609d
avformat: support shorten in nistshpere demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-07 22:15:41 +02:00
Mulvya
b7a776aa7b
doc/filters: add drawtext example
...
Show example which draws text at a random position, and switches positions every 30 seconds
Signed-off-by: Mulvya <mulvya@gmail.com >
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-04-07 09:40:36 -08:00
Diego Biurrun
d12b5b2f13
build: Split test programs off into separate files
...
This avoids spurious library rebuilds when only the test program
code is changed and simplifies the build system.
2016-04-07 16:14:42 +02:00
Diego Biurrun
330177b508
build: Group declarations for hw-accelerated de-/encoding separately
2016-04-07 15:26:08 +02:00
Diego Biurrun
01621202aa
build: miscellaneous cosmetics
...
Restore alphabetical order in lists, break overly long lines, do some
prettyprinting, add some explanatory section comments, group parts
together that belong together logically.
2016-04-07 15:26:08 +02:00
Diego Biurrun
e656a6ccd9
configure: cosmetics: Drop pointless end-of-line semicolons
2016-04-07 15:23:21 +02:00
F.Sluiter
3a9611d623
avfilter: add remap filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-07 14:02:46 +02:00
Michael Niedermayer
c169062073
swscale/utils: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-07 13:41:23 +02:00
Paul B Mahol
2d720069a9
avformat: add aix demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-07 09:08:53 +02:00
Vittorio Giovara
00658253e2
fate: Update DDS tests
2016-04-06 12:13:50 -04:00
Vittorio Giovara
22e49e6ede
dds: Simplify postprocessing check
2016-04-06 12:13:50 -04:00
Vittorio Giovara
0253863626
dds: Add support for alpha-only files
...
Due to how pixel format conversion is done, they behave the same way
as gray files.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-04-06 12:13:49 -04:00
Vittorio Giovara
9a9fb710bc
dds: Add support for rgb555 files
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-04-06 12:13:47 -04:00
Martin Vignali
6d7f5667a0
avcodec/exr: enable mipmap, ripmap decoding
2016-04-06 13:12:22 +02:00
James Almer
374974886a
fate: add missing filter-meta-4560-rotate0 dependencies
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-05 21:17:13 -03:00
Claudio Freire
8005b6de4f
AAC encoder: fix valgrind errors
...
Move wi.clipping computation outside of psy_lame_window, LFE
channels don't even call that, and make the LFE path also
initialize window_type[1] which is needed by analyze_channel
2016-04-05 23:13:44 -03:00
Michael Niedermayer
2c697c650c
fate: force fixed point aac decoder in filter-meta-4560-rotate0
...
This should fix a off by 1 difference between AARCH64 and X86
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-06 03:16:33 +02:00
Derek Buitenhuis
fdd7a594c3
libxvid: Create extradata in init using a dummy frame
...
Modifying global header extradata in encode_frame is an API violation
and only happens to work currently because mov writes its header
at the end of the file.
Heavily based off of a patch from 2012.
Original-by: Nicolas George <george@nsup.org >
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-05 11:16:24 -04:00
Clément Bœsch
040598218f
sws/aarch64: restore ff_hscale_8_to_15_neon()
...
Fix final scaling and required filter alignment. Pass FATE.
2016-04-05 12:00:36 +02:00
Paul B Mahol
56a3a3f01c
avformat: add musx demuxer
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-05 10:49:34 +02:00
Paul B Mahol
8a4c3f5258
avcodec: add adpcm dat4 decoder
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-05 10:48:59 +02:00
Claudio Freire
7d49abdf47
AAC encoder: fix filling of wi.clipping array
...
Fill all windows in all window groups instead of only the first
window of each group.
Also avoid uninitialized access of window_type.
2016-04-05 04:03:05 -03:00
Marton Balint
a07934d51b
ffplay: fix silence insertion on error or pause
...
Insertion of silence was a bit broken since
df34b70098 because the info whether or not the
source buffer supposed to be silence must be kept between callbacks. Failing to
do so causes rogue samples from the last buffer to be presented, I guess even a
crash can occur under some circumstances.
This patch uses a NULL audio_buf to keep the silence state across audio
callbacks.
Reviewed-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-04-04 23:24:58 +02:00
Martin Vignali
832861535a
libavcodec/exr : add support for compression in tile
2016-04-04 22:30:50 +02:00
Martin Vignali
062ad63064
libavcodec/exr : cosmetic change
2016-04-04 22:30:33 +02:00
Vittorio Giovara
8dde92b95a
fate: Update Screenpresso tests
2016-04-04 15:41:57 +02:00
Vittorio Giovara
ec8a69fab6
screenpresso: Correctly handle keyframes
...
The first byte contains compression level together with keyframe status.
When a frame is not interpreted correctly, its data is summed to the
reference, and would degrade over time, producing an incorrect result.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-04-04 15:40:14 +02:00
Vittorio Giovara
95db8c757c
screenpresso: Add extended pixel format support
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-04-04 15:40:06 +02:00
Vittorio Giovara
b5f47d95c6
fate: Update RSCC tests
...
The current sample comes from an older version of the codec, which
supports a single output mode, so rename it accordingly.
Add tests for the new pixel formats.
2016-04-04 15:39:58 +02:00
Vittorio Giovara
51dc4de121
rscc: Add extended pixel format support
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-04-04 15:39:51 +02:00
Diego Biurrun
4c6836db0f
nvenc_h264: Fix name of private AVClass
2016-04-04 15:05:27 +02:00
Michael Niedermayer
54c914651f
fate: Add wav-ac3 test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-04 03:12:24 +02:00
Michael Niedermayer
ec7fda2db5
fate: add fate-flv-demux
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-04 03:12:24 +02:00
Michael Niedermayer
419cb35e6f
fate: Add fate-ts-opus-demux
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-04 03:12:24 +02:00
James Almer
64b1ec804f
fate: add demux test for OggOpus
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-04-03 16:33:24 -03:00
Claudio Freire
52562503d5
AAC encoder: new regression test
...
Test to catch the recently fixed minsf bug
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-03 15:28:17 -03:00
Claudio Freire
bad41d3724
AAC encoder: fix initialization of minsf
...
In some situations (exactly zeroed DC coeffs) minsf would
be initialized with garbage
2016-04-03 15:03:53 -03:00
Luca Barbato
e3453fd444
matroska: Write the field order information
...
And bump the document version to 4.
2016-04-03 19:36:57 +02:00
Paul B Mahol
76466ab214
avformat/brstm: lower magic number, fixes decoding of some files
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-03 19:20:44 +02:00
Hendrik Leppkes
6518cbc52a
lavc/utils: Introduce ff_bprint_to_codecpar_extradata for avformat
...
It will be used by text subtitle demuxers to construct format instructions
straight into extradata. They all currently a similar function that accepts
an AVCodecContext instead.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-03 13:04:17 -04:00
Michael Niedermayer
06c4ed0c0e
avformat/wavdec: fix typo with len
...
Found-by: carl
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-03 17:56:02 +02:00
Martin Vignali
25a01c52b8
libavcodec/exr: add tile support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-03 17:09:34 +02:00
Martin Vignali
d2ed3391fb
libavcodec/exr: fix PRX24 Float decompression
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-04-03 17:09:29 +02:00
Martin Vignali
4f682318fb
fate/exr : add test for b44/b44a compression
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-03 04:18:20 +02:00
Michael Niedermayer
cf4d050b72
avformat/wavdec: Remove direct s->pb->buffer access
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-03 03:25:28 +02:00
Derek Buitenhuis
fcbdc44f4e
wavdec: Only set the codec ID in read_header
...
WAV is not a NOHEADER format, and thus should not be changing
stream codec IDs and probing in read_packet.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-03 01:55:57 +02:00
Michael Niedermayer
de0bcea664
avcodec/mjpegdec: Do not permute quantization tables
...
This fixes issues if the permutation changes, as quantizations tables would need to be reread
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-03 01:50:08 +02:00
Marios Titas
c1f9734f97
avfilter/src_movie: fix how we check for overflows with seek_point
...
Currently, if the movie source filter is used and a seek_point is
specified on a file that has a negative start time, ffmpeg will fail.
An easy way to reproduce this is as follows:
$ ffmpeg -vsync passthrough -filter_complex 'color=d=10,setpts=PTS-1/TB' test.mp4
$ ffmpeg -filter_complex 'movie=filename=test.mp4:seek_point=2' -f null -
The problem is caused by checking for int64_t overflow the wrong way.
In general, to check whether a + b overflows, it is not enough to do:
a > INT64_MAX - b
because b might be negative; the correct way is:
b > 0 && > a > INT64_MAX - b
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-03 01:50:08 +02:00
Hendrik Leppkes
ce87711df5
exif: take a generic log context
...
The AVCodecContext is only used for logging, so instead take any valid log context.
This allows reusing the exif functions more easily in avformat.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-02 22:48:15 +01:00
Hendrik Leppkes
994412fb9b
avcodec: properly initialize AVCodecParameters profile/level
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-04-02 22:48:03 +01:00
Rodger Combs
4b150fbe1f
lavf/segment: add option to write empty filler segments as needed
2016-04-02 13:31:26 -05:00
Rodger Combs
5b4f44f66a
lavf/segment: slight refactor to seg_write_packet
...
This reduces some code duplication, and ensures that cur_entry.last_duration is
always set.
2016-04-02 13:31:26 -05:00
Rodger Combs
44a9395b5a
lavf/segment: style nit
2016-04-02 13:31:26 -05:00
Rick Kern
c9ad357aeb
lavc/videotoolboxenc: Workaround encoder error
...
CMVideoFormatDescriptionGetH264ParameterSetAtIndex() fails on some
hardware/OS versions when retrieving the parameter set count alone.
Signed-off-by: Rick Kern <kernrj@gmail.com >
Signed-off-by: wm4 <nfxjfg@googlemail.com >
2016-04-02 19:16:20 +02:00
Rick Kern
7801669470
lavc/videotoolboxenc: Fix crash when closing codec after error
...
Fixes crash in #5352 . VTCompressionSessionInvalidate() crashes if the
internal encoder hasn't completed, but hasn't experienced an error.
The function call isn't needed since the encoder is invalidated when
the reference count reaches 0 anyway.
Signed-off-by: Rick Kern <kernrj@gmail.com >
Signed-off-by: wm4 <nfxjfg@googlemail.com >
2016-04-02 19:16:15 +02:00
Clément Bœsch
ffd1c3eeb7
lavc/utils: use pkt_timebase for legacy subtitles timing code
...
This is consistent with other AVSubtitle timing adjustments.
2016-04-02 19:03:06 +02:00
Clément Bœsch
d8620158c7
lavc/ccaption_dec: remove usage of avctx->time_base
...
lavc/utils already rescales avpkt->pts to sub->pts in AV_TIME_BASE_Q
before calling the decode callback. This prevents from rescaling again
into the decoder, and avoid the use of avctx->time_base which will
disappear in the incoming codecpar merge.
This commit also replaces the use of "20 centisecond" (ass time base)
with "200 ms".
2016-04-02 19:03:06 +02:00
Mark Thompson
b3051a460c
vaapi_h264: Fix bit offset of slice data.
...
Commit ca2f19b9cc modified the meaning of
H264SliceContext.gb: it is now initialised at the start of the NAL unit
header, rather than at the start of the slice header. The VAAPI slice
decoder uses the offset after parsing to determine the offset of the
slice data in the bitstream, so with the changed meaning we no longer
need to add the extra byte to account for the NAL unit header because
it is now included directly.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-04-02 17:56:49 +02:00
Tim Walker
33275a0de0
ac3dec: change logging of skipped E-AC-3 substreams.
...
Change log level from warning to debug: the E-AC-3 "core"
substream can be successfully decoded without the additional
and dependent substreams, and their presence is already
indicated via avpriv_request_sample in ff_eac3_parse_header.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-04-02 14:06:40 +02:00
Tim Walker
fef2147b7a
eac3dec: don't call avpriv_request_sample every frame.
...
These errors neither prevent nor stop successful decoding
of the E-AC-3 stream's "core", causing avpriv_request_sample
to be called for every single frame in the bitstream.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-04-02 14:05:07 +02:00
Stefano Sabatini
e8a9b64410
lavu/base64: add AV_BASE64_DECODE_SIZE() macro
...
This is consistent with the AV_BASE64_SIZE macro and avoids the literal
use of constants in the code.
2016-04-02 12:48:21 +02:00
Rodger Combs
b4daa2c40f
lavc/audiotoolboxdec: add eac3 decoder
...
This is added in 10.11, so we add a #define when building against older SDKs.
The decoder actually supports 7.1-channel eac3, but since the parser only
reports 6 channels, we end up decoding the 5.1 downmix (same as the internal
decoder) for now.
2016-04-02 03:03:13 -05:00
Rodger Combs
1b9e90ee80
lavc/audiotoolboxdec: fix a number of config and timestamp issues
...
- ADTS-formatted AAC didn't work
- Channel layouts were never exported
- Channel mappings were incorrect beyond stereo
- Channel counts weren't updated after packets were decoded
- Timestamps were exported incorrectly
2016-04-02 03:03:13 -05:00
Rodger Combs
59a4492371
lavc/audiotoolboxdec: support ADTS AAC input
2016-04-02 03:03:13 -05:00
Rodger Combs
36770d8769
lavc/audiotoolboxenc: allow setting maxrate with pre-10.9 deployment targets
...
The build failure here is caused by the enum value not being defined, but
as long as we're on a newer SDK that has it, it's safe to use it even
when our deployment target is older. Setting the property will error, but
we're not failing on errors there.
2016-04-02 03:03:13 -05:00
Rodger Combs
0667327f3f
lavc/audiotoolboxenc: fix iOS build
2016-04-02 03:03:13 -05:00
Rodger Combs
c820e600ea
lavc/audiotoolboxenc: fix a number of config issues
...
- size variables were used in a confusing way
- incorrect size var use led to channel layouts not being set properly
- channel layouts were incorrectly mapped for >2-channel AAC
- bitrates not accepted by the encoder were discarded instead of being clamped
- some minor style/indentation fixes
2016-04-02 03:03:13 -05:00
Rodger Combs
7524b67817
lavc/audiotoolboxenc: remove unneeded packet metadata
...
This isn't necessary here, and for some reason broke only multichannel
AAC encoding when a channel layout tag was set.
2016-04-02 03:03:13 -05:00
Rodger Combs
d38fe9f493
lavf/segment: support automatic bitstream filtering
...
Most useful for MPEG-TS. Works by having the underlying muxer configure the
bitstream filters, then moving them to our own AVStreams.
2016-04-02 03:03:13 -05:00
Ronald S. Bultje
b3eda69490
swscale: add bt2020 yuv2rgb coefficients.
2016-04-01 15:39:48 -04:00
Ronald S. Bultje
98038e2ee0
swscale: fix bt709 yuv2rgb coefficients.
...
They were derived from incorrect values cr=0.2125 (should be cr=0.2126)
and cb=0.0721 (should be cb=0.0722).
2016-04-01 15:39:47 -04:00
Michael Niedermayer
0de1c1ab86
fate: add demux test for TS with AC3 (Ticket 4864)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-01 19:09:59 +02:00
Michael Niedermayer
7615197b6e
fate: Test for Ticket4560
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-01 19:09:50 +02:00
Michael Niedermayer
1d64a9d9f6
fate: Add regression test for Ticket 1239
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-01 19:09:34 +02:00
Michael Niedermayer
9f03b85045
avcodec/parser: assert that the codec id is not NONE in av_parser_parse2()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-01 19:08:29 +02:00
Aaron Boxer
b6b4b0a65e
avcodec/j2kenc: Add attribution to OpenJPEG project:
...
http://ghostscript.com/~tor/gs-browse/gs/openjpeg/libopenjpeg/t1.c
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-04-01 17:35:15 +02:00
Clément Bœsch
eadaef2a63
sws/aarch64: disable ff_hscale_8_to_15_neon temporarly
...
Looks broken.
2016-04-01 17:33:01 +02:00
Matthieu Bouron
58994d7bca
swscale/arm/yuv2rgb: make the code bitexact with its aarch64 counter part
2016-04-01 17:23:45 +02:00
Matthieu Bouron
5629361cc2
swscale/arm/yuv2rgb: save a few instructions by processing the luma line interleaved
2016-04-01 17:23:45 +02:00
Matthieu Bouron
339668301e
swscale/arm/yuv2rgb: re-order compute_rgba macro arguments
2016-04-01 17:23:45 +02:00
Matthieu Bouron
ff4885face
swscale/arm/yuv2rgb: rename {process_1l,process_2l,compute}_16px{,_internal} macros
2016-04-01 17:23:45 +02:00
Matthieu Bouron
562653b731
swscale/arm/yuv2rgb: macro-ify
2016-04-01 17:23:45 +02:00
Matthieu Bouron
0286b56f2f
swscale/arm/yuv2rgb: factorize lsl in load_args_nvx
2016-04-01 17:23:45 +02:00
Matthieu Bouron
0649fe0fae
swscale/arm/yuv2rgb: factorize lsl in load_args_yuv420p
2016-04-01 17:23:45 +02:00
Matthieu Bouron
2aec59c07c
swscale/arm/yuv2rgb: remove unused store of dst + linesize in load_args_yuv422p
2016-04-01 17:23:45 +02:00
Matthieu Bouron
b3ea901945
swscale/arm/yuv2rgb: factorize lsl in load_args_yuv422p
2016-04-01 17:23:45 +02:00
Matthieu Bouron
466e209e6e
swscale/arm/yuv2rgb: fix comments in load_args_yuv422p
2016-04-01 17:23:45 +02:00
Matthieu Bouron
11b4acab8b
swscale/arm/yuv2rgb: remove 32bit code path
2016-04-01 17:23:45 +02:00
wm4
a5f5b8b96a
lavc: factor apply_param_change() AV_EF_EXPLODE handling
...
Remove the duplicated code for handling failure of apply_param_change().
2016-04-01 12:52:56 +02:00
wm4
f099cb2f8a
lavu: improve documentation of some AVFrame functions
2016-04-01 12:52:12 +02:00
Luca Barbato
1db8eb1549
avconv: Drop an unused variable
2016-04-01 05:30:22 +02:00
Derek Buitenhuis
54ccaaeb2b
psxstr: Remove some commented out code
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-31 21:46:14 +01:00
Clément Bœsch
be8d98c1ad
lavc/utils: transfer width/height for subs in codecpar
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-31 21:20:39 +01:00
Derek Buitenhuis
dd77dad4e6
codecpar: Add video delay field
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-31 21:20:39 +01:00
Hendrik Leppkes
5b4f8af2f1
Add frame_size to AVCodecParameters
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-31 21:20:39 +01:00
James Almer
3fafde6cbe
lavc: Add seek_preroll to AVCodecParameters
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-31 21:20:39 +01:00
Derek Buitenhuis
e6053b3b19
Merge commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7'
...
* commit 'a8068346e48e123f8d3bdf4d64464d81e53e5fc7':
lavc: add a variant of av_get_audio_frame_duration working with AVCodecParameters
Fixes from jamrial incorporated.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-31 21:20:02 +01:00
Derek Buitenhuis
f9b1cf15c2
Merge commit '998e1b8f521b73e1ed3a13caaabcf79eb401cf0d'
...
* commit '998e1b8f521b73e1ed3a13caaabcf79eb401cf0d':
lavc: add codec parameters API
Fixes added in:
- bit_rate has been made int64_t to match.
- profile and level are properly initialize.
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-31 21:19:03 +01:00
Pedro Arthur
6de58b4903
swscale: cleanup unused code
...
Removed previous swscale code under '#ifndef NEW_FILTER'
and removed unused fields of SwsContext
2016-03-31 16:36:16 -03:00
Michael Niedermayer
3b905b9fe6
swscale: Deprecate vector functions which are unused outside swscale
...
There are no known users of these functions within debian
It should be thus possible to remove these functions without recommandition of a
replacement
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-31 20:21:14 +02:00
Josh de Kock
6bb99757b7
jack: Support OSX
...
Previously, with JACK installed, the configure script would enable the
JACK indev; this broke on OS X due to an incomplete pthreads
implementation. Add some simple macros to map libdispatch to pthreads
on OS X.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-03-31 18:03:21 +02:00
Luca Barbato
5f02266681
matroska: Support interlaced content correctly
...
The matroska specification now has two elements for it.
2016-03-31 18:03:21 +02:00
Alex Smith
a677121cc5
configure: Fix debugging on mingw-w64 with gdb
...
The relocation hack broke debugging on mingw-w64 when using gdb. This
makes the reloc hack dependent on --disable-debug so it's still enabled
for release builds.
This is simply an immediate fix for the issue of broken debugging, we
should probably still look at the possibility of reverting it outright
if it proves to be more trouble than it's worth. For now keeping it
enabled for release builds is a reasonable trade off.
Signed-off-by: Alex Smith <theryuu@warpsharp.info >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-31 14:34:17 +02:00
Paul B Mahol
cf925e0ac1
doc/filters: add stereotools examples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-31 11:16:01 +02:00
Paul B Mahol
241a3a6ca4
doc/filters: add sofalizer examples
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-31 11:04:42 +02:00
Clément Bœsch
263eb76bdf
sws/aarch64: add ff_hscale_8_to_15_neon
...
./ffmpeg -nostats -f lavfi -i testsrc2=4k:d=2 -vf bench=start,scale=1024x1024,bench=stop -f null -
before: t:0.489726 avg:0.489883 max:0.491852 min:0.489482
after: t:0.256515 avg:0.256458 max:0.256999 min:0.253755
2016-03-31 10:12:55 +02:00
Claudio Freire
be746ae470
AAC encoder: fix undefined behavior
...
Fix uninitialized access of minsf in short windows
Fix potential invocation of coef2minsf(0)
2016-03-30 22:35:28 -03:00
James Almer
9bf3d01d91
avformat/latmenc: auto-insert aac_adtstoasc bitstream filter when needed
...
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-30 21:58:48 -03:00
Michael Niedermayer
a35a4a5774
fate: Add filter-metadata-cropdetect
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-30 22:55:51 +02:00
Diego Biurrun
44f05f15d4
build: Do not check the vaapi_encode.h header if VAAPI is not enabled
2016-03-30 17:52:46 +02:00
Diego Biurrun
bd016dbf23
Mark tables used only within their files as static
2016-03-30 17:19:13 +02:00
Diego Biurrun
061dc20351
h264: Add missing ff_ prefix to internally visible h264_init_dequant_tables()
2016-03-30 17:19:13 +02:00
Claudio Freire
c883da6bf4
AAC encoder: fix signed integer overflow
...
Clamp scalefactors by coef2minsf to avoid undefined behavior
caused by signed integer overflow. It also avoids clipping of
coefficients so it should avoid artifacts as well, on very
rare corner cases.
2016-03-30 10:05:03 -03:00
Timo Rothenpieler
b3557c79dc
avcodec/nvenc: Generate AUD NAL units for better compatiblity
2016-03-30 12:03:59 +02:00
Anton Khirnov
69a638019f
avconv: fix -frames for video
...
For video, frame_number tracks the number of frames sent to the encoder.
So it should be incremented when we submit a frame, not when we get a
packet back.
2016-03-30 09:13:09 +02:00
Mark Thompson
83f230c244
lavc: VAAPI MJPEG encoder
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-30 09:11:44 +02:00
Mark Thompson
31fe1f2577
lavc: VAAPI H.265 encoder
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-30 09:11:25 +02:00
Mark Thompson
2c62fcdf5d
lavc: VAAPI H.264 encoder
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-30 09:10:26 +02:00
Mark Thompson
104c804bca
lavc: VAAPI encode common infrastructure
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-30 09:05:28 +02:00
Mark Thompson
5d273d3efa
avconv: VAAPI hwcontext initialisation and hwaccel helper
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-30 09:04:53 +02:00
Michael Niedermayer
b3ec5b00ce
tests/audiomatch: Reduce search window
...
This avoids unneeded computations
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-30 03:37:56 +02:00
Michael Niedermayer
c7b983249a
tests/audiomatch: also print signal vs reference length
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-30 03:37:56 +02:00
Paul B Mahol
974734c98c
doc/filters: remove false claim in sofalizer description
...
Remove false claim that processing in freq domain is
worse quality than processing in time domain.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-30 02:35:51 +01:00
Rostislav Pehlivanov
02172d93f6
Revert "aacenc: use av_clip() instead of av_clip() during quantization"
...
This reverts commit c0918613a0 , since it
triggered a new assertion with gcc.
This bug definitely needs a true proper fix.
2016-03-30 02:31:22 +01:00
Rostislav Pehlivanov
7cda7683a5
Revert "doc/filters: remove false claim in sofalizer description"
...
This reverts commit bf1495d9a9 .
2016-03-30 02:30:19 +01:00
Rostislav Pehlivanov
c0918613a0
aacenc: use av_clip() instead of av_clip() during quantization
...
Seems like clang might be miscompiling it and causing a signed integer overflow,
making a FATE test fail.
Doesn't seem to affect performance, it only runs on the ESC codebook.
Reviewed-by: Claudio Freire <klaussfreire@gmail.com >
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-30 01:04:43 +01:00
Paul B Mahol
bf1495d9a9
doc/filters: remove false claim in sofalizer description
...
Remove false claim that processing in freq domain is
worse quality than processing in time domain.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-29 22:29:31 +02:00
Paul B Mahol
4a80a6ad21
avfilter/vf_waveform: optimize lowpass filter even more
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-29 22:02:48 +02:00
Jovan Zelincevic
b73c27151e
avcodec/mips: Optimization synced to the newest code base.
...
FFT expanded to 2^17.
Signed-off-by: Jovan Zelincevic <jovan.zelincevic@imgtec.com >
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-29 17:06:16 +02:00
Vittorio Giovara
7888ae8266
cfhd: Do not initialize context size
...
Otherwise probing and stream analisys will report a correct coded size
but an empty visible size.
Approved by: kieran
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-29 17:06:15 +02:00
Vittorio Giovara
ca8c759173
intrax8: Remove mpegvideo dependency
2016-03-29 13:41:09 +02:00
Diego Biurrun
6ebd06a9b2
intrax8: Drop lots of pointless parentheses
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-03-29 13:41:09 +02:00
Vittorio Giovara
9b57995cdd
intrax8: Drop MB emulation code
...
This is already performed in init_context_frame().
2016-03-29 13:41:09 +02:00
Vittorio Giovara
9fa888c028
intrax8: Keep a reference to the decoder blocks
2016-03-29 13:41:09 +02:00
Vittorio Giovara
c2084ffcbf
intrax8: Use the generic horizband function
...
This is assuming that intrax8 has no support for interlacing
Carry over lowdelay value in ff_intrax8_decode_picture.
2016-03-29 13:41:09 +02:00
Vittorio Giovara
b1268e0f03
intrax8: Pass macroblock coordinates to ff_intrax8_decode_picture
...
These values need to be updated with the last macroblock position,
so keep them as pointers.
2016-03-29 13:41:09 +02:00
Vittorio Giovara
d0540fd021
intrax8: Pass macroblock size to ff_intrax8_common_init
...
Helps in decoupling this code from mpegvideo.
2016-03-29 13:41:09 +02:00
Vittorio Giovara
9f4d99138d
fate: Add test for WMV2 with jframes
2016-03-29 13:41:09 +02:00
James Almer
d5a3578350
avformat/svag: fix division by zero
...
Fixes ticket #5386
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-28 21:34:08 -03:00
Lou Logan
06eef96b69
fix some a/an typos
...
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-03-28 14:13:17 -08:00
Marton Balint
99f2a59c2f
avcodec/utils: fix packet duration of frames with discarded paddings
...
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-28 23:40:12 +02:00
Lou Logan
cd76eb8f4a
lavd/dshow_crossbar: remove trailing whitespace
...
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-03-28 13:31:38 -08:00
Paul B Mahol
a55c953ef0
avfilter/af_sofalizer: allow user to setup custom virtual speakers positions
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-28 21:27:59 +02:00
Kirill Gavrilov
f3ec8ac0f4
lavc/mediacodec: fix zero stride for OMX.allwinner.video.decoder.avc
2016-03-28 21:23:15 +02:00
Paul B Mahol
c2bbcf1607
avfilter/vf_waveform: optimize 16bit lowpass filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-28 12:28:03 +02:00
Paul B Mahol
ff982e02b5
avcodec: add dca core extraction bsf
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-28 10:50:41 +02:00
Anton Khirnov
ca2f19b9cc
h264: switch to h2645_parse for NAL parsing
2016-03-28 10:16:28 +02:00
Matthieu Bouron
308d3ed5aa
lavc/mediacodec: use ternary operator to set slice-height value
2016-03-28 10:10:21 +02:00
Anton Khirnov
a7829a2a3f
h264: reimplement 3aa661ec5 in a more explicit way
...
Instead of handling the problem inside NAL decoding code, add a higher
level wrapper function. This should be more robust against future
changes (and easier to read).
2016-03-28 10:10:18 +02:00
Anton Khirnov
add1467e5e
svq3: drop the build dependency on the h264 decoder
2016-03-28 09:58:26 +02:00
Anton Khirnov
a4d126dc59
svq3: eliminate remaining H264Context usage.
2016-03-28 09:58:14 +02:00
Anton Khirnov
7bbdae81e8
svq3: move block_offset to SVQ3Context
2016-03-28 09:58:07 +02:00
Anton Khirnov
1848a154a4
svq3: stop using H264Context.gb
2016-03-28 09:57:58 +02:00
Anton Khirnov
ea6ab02a17
svq3: move the frame num variables to the SVQ3Context
2016-03-28 09:57:45 +02:00
Anton Khirnov
21b7469322
svq3: eliminate H264Context.cur_pic usage
...
Use the SVQ3Context variable instead
2016-03-28 09:57:24 +02:00
Anton Khirnov
939b388383
svq3: eliminate remaining H264SliceContext usage
2016-03-28 09:56:57 +02:00
Anton Khirnov
5a5db90edf
svq3: move pict_type to the SVQ3Context
2016-03-28 09:56:45 +02:00
Anton Khirnov
12f13ecb2d
svq3: move mb strides/sizes to the SVQ3Context
2016-03-28 09:56:36 +02:00
Anton Khirnov
ad9d3384de
svq3: move the dequant buffer to SVQ3Context
...
Remove now unnecesary call to ff_h264_alloc_tables()
2016-03-28 09:56:09 +02:00
Anton Khirnov
549fc77273
svq3: move mb2br_xy to the SVQ3Context
2016-03-28 09:55:55 +02:00
Anton Khirnov
99dde60391
svq3: move {ref,mv}_cache to the SVQ3Context
2016-03-28 09:55:47 +02:00
Anton Khirnov
89a13998a1
svq3: rip out the svq3-relevant parts of pred_motion() out of h264
2016-03-28 09:55:24 +02:00
Anton Khirnov
8eecae77ff
svq3: move edge_emu_buffer to the SVQ3Context
2016-03-28 09:55:16 +02:00
Anton Khirnov
527bf5f7c6
svq3: move the pred mode variables to SVQ3Context
...
This will allow removing the H264Context dependency in the future.
2016-03-28 09:54:37 +02:00
Anton Khirnov
ecc31f6b08
h264: move ff_h264_check_intra[4x4]_pred_mode() to h264_parse
...
It is shared with svq3.
2016-03-28 09:53:56 +02:00
Anton Khirnov
1877712c58
svq3: move mb_{x,y,xy} to SVQ3Context
...
This will allow removing the H264Context dependency in the future.
2016-03-28 09:53:45 +02:00
Anton Khirnov
c2a4ca944d
svq3: eliminate write_back_intra_pred_mode() usage
...
This function depends on the h264 internals and is so tiny that just
copying the code out is the simplest replacement.
2016-03-28 09:51:10 +02:00
Anton Khirnov
c73fb9efb2
svq3: add all the required dsp contexts into SVQ3Context
...
Stop using the H264Context ones, to allow removing the H264Context
dependency.
2016-03-28 09:50:51 +02:00
Anton Khirnov
15b0517da9
svq3: make the dsp functions static
...
There is no need for them to be extern anymore.
2016-03-28 09:50:41 +02:00
Anton Khirnov
9b30f8dd8f
h264: remove the svq3-specific code
2016-03-28 09:50:25 +02:00
Anton Khirnov
e42ca48a8b
svq3: rip out the mb decoding code shared with h264
...
The ~100 lines of shared code is not worth the pain of svq3 messing with
h264 internals.
2016-03-28 09:49:53 +02:00
Anton Khirnov
e481458bc3
h264: factor out pred weight table parsing into a separate file
...
This will allow decoupling the parser from the decoder.
2016-03-28 09:48:31 +02:00
Anton Khirnov
90ed6c5cf7
h2645_parse: compute the actual data length, without trailing paddding
...
This is required by h264.
2016-03-28 09:47:25 +02:00
Anton Khirnov
b667252a41
h2645_parse: add support for parsing h264
2016-03-28 09:45:04 +02:00
Anton Khirnov
52ec149fbe
h2645_parse: change the AVCodecContext* parameter to void*
...
This should make it more clear that it is not supposed to be used for
anything except logging.
2016-03-28 09:43:31 +02:00
Anton Khirnov
8229eff4b7
h2645_parse: add a function for uninitializing the packet
2016-03-28 09:43:18 +02:00
Anton Khirnov
fa936a307f
hevc_parse: rename into h2645_parse
...
This code will be shared with h264.
2016-03-28 09:42:44 +02:00
Michael Niedermayer
8f2a1990c0
avcodec/diracdec: check bitstream size related fields for overflows
...
Fixes segfault
Fixes Ticket5333
Regression since bfc8a4dabe
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-28 04:39:57 +02:00
Timo Rothenpieler
665c05f7cb
configure: Fail if CUDA enabled but not found
...
Without this patch, configure still passes and enables CUDA, no matter
if it was actually found, breaking the build in case it was not.
2016-03-28 01:14:36 +02:00
Paul B Mahol
48be92e5b6
avfilter/vf_waveform: optimize lowpass 8bit filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-27 23:29:38 +02:00
Paul B Mahol
0b9957c301
avfilter/vf_waveform: move mirror variable into function argument
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-27 22:50:04 +02:00
Kieran Kunhya
e259dc86a8
avcodec: Remove libdcadec, we already have it merged internally
2016-03-27 04:21:38 +01:00
Michael Niedermayer
c50be7a52b
avcodec/h264_slice: Check PPS more extensively when its not copied
...
Fixes Ticket5371
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-27 05:03:44 +02:00
Marton Balint
8ff0f6ae82
avformat/segment: set format options for all segments
...
Fixes ticket #5318 .
Reviewed-by: Stefano Sabatini <stefasab@gmail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-26 23:26:27 +01:00
Martin Storsjö
cdb1665f70
aarch64: Make transpose_4x4H do a regular transpose
...
Previously, ff_h264_idct_add_neon (originally in the arm version) used
a non-regular transpose in order to be able to use more instructions
that deal with registers as 128 bit register pairs. The aarch64
translation doesn't do it to the same extent, but brought along the
same structure since it was a straight translation.
This reshuffles ff_h264_idct_add_neon, bringing it closer to
the C implementation, making the transpose_4x4H macro do a regular
transpose, usable for other algorithms as well.
Previously, the third and fourth output from transpose_4x4H were
swapped, and prior to cc29d96d5a , the same inputs as well. In
addition to just swapping the outputs, also renumber the intermediate
registers for better readability (making the register order match
transpose_4x8B).
This runs with the same number of cycles as before.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-26 21:25:56 +02:00
Michael Niedermayer
5a19506088
fate: Remove vsync drop from some h264 tests
...
Note some tests need vsync drop to produce exact timestamps, these seem not to
need it. quite likely many more dont need it either, ive not checked beyond finding
one that needs it and the ones which have it removed
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-26 16:39:20 +01:00
Michael Niedermayer
d4424d7de2
fate: Modify a random h264 test to also test the -framerate option
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-26 16:39:19 +01:00
Dan Dennedy
28688d7c2b
avcodec/audiotoolboxenc: Fix compile error on OS X 10.8.
...
Fixes error "libavcodec/audiotoolboxenc.c:294:50: error: use of undeclared
identifier 'kAudioCodecPropertyPacketSizeLimitForVBR'."
That was added to 10.9:
https://developer.apple.com/library/mac/releasenotes/General/APIDiffsMacOSX10_9/AudioUnit.html
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-26 16:35:44 +01:00
Carl Eugen Hoyos
de1a0d4359
lavc/flicvideo: Implement padding in COPY chunks.
...
Reviewed-by: Reimar
2016-03-26 14:56:55 +01:00
Michael Niedermayer
c06bdc60c9
avformat/rtpdec: Remove stray debug av_log()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-26 11:02:58 +01:00
Martin Vignali
495f08edb4
avcodec/exr: add support for B44 and B44A compression
2016-03-26 09:27:26 +01:00
Ico Doornekamp
edf54887e2
rtpdec_jpeg: fix low contrast image on low quality setting
...
The problem is that the argument 'q' is of the type uint8_t.
According to the JPEG standard, if 1 <= q <= 50, the scale factor
'S' should be 5000 / Q. Because the create_default_qtables() reuses
the variable 'q' to store the result of this calculation, for small
values of q < 19, q wil subsequently overflow and give wrong results
in the calculated quantization tables.
Instead, use a new variable 'S' (same name as in RFC2435) with the
proper range to store the result of the division.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-26 00:15:24 +02:00
Paul B Mahol
585cfabb79
avcodec/jpeg2000dec: add slice threading support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-25 22:00:52 +01:00
Paul B Mahol
e2298b3fcc
avcodec/jpeg2000dec: account two last bytes from end of bytestream as EOC marker
...
This silences missing EOC marker when decoding j2k files with Psot set to 0.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-25 22:00:52 +01:00
Vittorio Giovara
159323897f
intrax8: Add a local BlockDSPContext and initialize it
...
Helps in decoupling this code from mpegvideo.
2016-03-25 15:55:49 -04:00
Vittorio Giovara
1eaae7abb8
intrax8: Reference the current AVCodecContext
...
It will be needed to initialize BlockDSP in the next commit.
2016-03-25 15:55:02 -04:00
Vittorio Giovara
8072345e9f
intrax8: Keep a reference to the GetBitContext reader
...
Helps in decoupling this code from mpegvideo.
2016-03-25 15:54:29 -04:00
Vittorio Giovara
65f14128c4
intrax8: Use a constant buffer instead of a ScratchpadContext
...
The size of the block is fixed (8x8 plus padding).
2016-03-25 15:54:06 -04:00
Vittorio Giovara
eaeba6f241
intrax8: Pass the output frame to the decoding function
...
Helps in decoupling this code from mpegvideo.
2016-03-25 15:53:02 -04:00
Vittorio Giovara
577393321c
intrax8: Carry over the loopfilter value in ff_intrax8_decode_picture
...
Helps in decoupling this code from mpegvideo.
2016-03-25 15:52:44 -04:00
Vittorio Giovara
68127e1bf8
intrax8: Keep a reference to the context idctdsp
...
Use it instead of the embedded mpegvideo one. Update init function
signature to load it directly from the callers.
2016-03-25 15:52:24 -04:00
Vittorio Giovara
65127450ad
intrax8: Make x8_init_block_index not use mpegvideo fields
2016-03-25 15:52:10 -04:00
Vittorio Giovara
922b7e6d86
intrax8: Use local destination buffers
...
These buffers are just a way to store frame pointers and be able to
modify them without touching the original ones.
The two dependent decoders (WMV2 and VC1) do not need special care for
these fields: the former does not seem to use the dest buffers, while
the latter reinits them every time to the current frame data buffers.
So only keep a local copy rather than the one from mpegvideo.
2016-03-25 15:51:50 -04:00
Thilo Borgmann
4d251723c0
lavfi: Add coreimage filter for GPU based image filtering on OSX.
2016-03-25 17:18:49 +01:00
Thilo Borgmann
4ebf0b109c
lavu/dict: Add new flag to allow multiple equal keys.
2016-03-25 17:08:11 +01:00
Clément Bœsch
277408b7f1
sws/aarch64/yuv2rgb: save a few mul and add
...
27ms to 26ms with UHD 2160 input.
2016-03-25 16:14:13 +01:00
Diego Biurrun
a7da517f6a
h264data: Move all data tables from a header to a .c file
2016-03-25 15:56:14 +01:00
Diego Biurrun
f4d581cda3
lavc: Deduplicate zigzag_scan table
2016-03-25 15:23:56 +01:00
Diego Biurrun
02cd8bb9cb
h264: Clean up #includes
2016-03-25 15:23:55 +01:00
Anton Khirnov
704a397697
rtmpdh: add an stdio.h include
...
The test uses printf.
2016-03-25 14:53:37 +01:00
Anton Khirnov
e3dfef8e3c
qsvdec_h2645: switch to the new BSF API
2016-03-25 14:53:37 +01:00
Anton Khirnov
a638e9184d
vf_fade: make sure the slice end is always in the frame
...
CC: libav-stable@libav.org
2016-03-25 14:53:31 +01:00
James Almer
99388eb091
avcodec/libopenjpegenc: fix mixed declarations and code
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-25 00:05:05 -03:00
James Almer
21cd0228be
avcodec/libopenjpegdec: fix mixed declarations and code
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-25 00:04:57 -03:00
Michael Niedermayer
0cd9ff4e3a
avcodec/libutvideodec: copy frame so it has reference counters when refcounted_frames is set
...
Reviewed-by: maintainer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-24 22:52:01 +01:00
Diego Biurrun
3b08d9d932
testprogs: K&R formatting cosmetics
2016-03-24 21:45:07 +01:00
Michael Niedermayer
54f43984e1
avutil/parseutils: mark args as static const
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-24 19:31:02 +01:00
Petru Rares Sincraian
f707042c93
Added more tests to libavutil/parseutils.c
...
- Added tests for av_find_info_tag().
- Added test for av_get_known_color_name()
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-24 19:29:43 +01:00
Diego Biurrun
439929859a
testprogs: Clean up #includes
2016-03-24 19:17:23 +01:00
Diego Biurrun
3dfbf32b95
build: Drop redundant removal of compiled object files
...
This is already taken care of by CLEANSUFFIXES.
2016-03-24 19:17:23 +01:00
Diego Biurrun
b298b36fc0
fate: Only run SRTP test if SRTP code is enabled
2016-03-24 19:17:23 +01:00
Ico Doornekamp
e3e6a2cff4
avformat/rtpdec_jpeg: fix low contrast image on low quality setting
...
Original mail and my own followup on ffmpeg-user earlier today:
I have a device sending out a MJPEG/RTP stream on a low quality setting.
Decoding and displaying the video with libavformat results in a washed
out, low contrast, greyish image. Playing the same stream with VLC results
in proper color representation.
Screenshots for comparison:
http://zevv.nl/div/libav/shot-ffplay.jpg
http://zevv.nl/div/libav/shot-vlc.jpg
A pcap capture of a few seconds of video and SDP file for playing the
stream are available at
http://zevv.nl/div/libav/mjpeg.pcap
http://zevv.nl/div/libav/mjpeg.sdp
I believe the problem might be in the calculation of the quantization
tables in the function create_default_qtables(), the attached patch
solves the issue for me.
The problem is that the argument 'q' is of the type uint8_t. According to the
JPEG standard, if 1 <= q <= 50, the scale factor 'S' should be 5000 / Q.
Because the create_default_qtables() reuses the variable 'q' to store the
result of this calculation, for small values of q < 19, q wil subsequently
overflow and give wrong results in the calculated quantization tables. The
patch below uses a new variable 'S' (same name as in RFC2435) with the proper
range to store the result of the division.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-24 15:40:10 +01:00
Rostislav Pehlivanov
72e1360007
vc2enc: optimize and simplify quantization
...
Everything except ORing the sign is now done in the LUT.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-24 13:04:59 +00:00
Michael Niedermayer
26811fd946
avformat/mpegtsenc: Fix used service
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-24 12:35:19 +01:00
Michael Niedermayer
50d017a281
avformat/mpegtsenc: Keep track of the program for each service
...
Simplifies code
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-24 12:27:23 +01:00
Martin Storsjö
3ee2ec5ec1
unix: Use rw_timeout for setting the connect timeout
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:34:29 +02:00
Martin Storsjö
136c3438bb
tcp: Use rw_timeout for setting the connect/listen timeouts
...
Apply the default value for timeout in code instead of via the
avoption, to allow distinguishing the default value from the user
not setting anything at all.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:34:24 +02:00
Martin Storsjö
fab8156b2f
avio: Copy URLContext generic options into child URLContexts
...
Since all URLContexts have the same AVOptions, such AVOptions
will be applied on the outermost context only and removed from the
dict, while they probably make sense on all contexts.
This makes sure that rw_timeout gets propagated to the innermost
URLContext (to make sure it gets passed to the tcp protocol, when
opening a http connection for instance).
Alternatively, such matching options would be kept in the dict
and only removed after the ffurl_connect call.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:34:19 +02:00
Michael Niedermayer
564b4591bb
opt: Add av_opt_copy()
...
This includes documentation and other modifications by
Lukasz Marek and Martin Storsjö.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:34:15 +02:00
Lukasz Marek
8833f1508b
opt: Add const to av_opt_next
...
Also add const to pointers in static functions within opt.c where
possible/necessary.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:34:09 +02:00
Martin Storsjö
933dec0e29
file: Add an option for following a file that is being written
...
Using this requires setting the rw_timeout option to make it
terminate, alternatively using the interrupt callback (if used via
the API).
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:33:59 +02:00
Andrey Utkin
ccea588f83
avio: Add an option 'rw_timeout'
...
If set non-zero, this limits duration of the retry_transfer_wrapper()
loop, thus affecting ffurl_read*(), ffurl_write(). As soon as
one single byte is successfully received/transmitted, the timer
restarts.
This has further changes by Michael Niedermayer and Martin Storsjö.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:33:50 +02:00
Martin Storsjö
d44f3e4059
avio: Apply avoptions on the URLContext itself as well
...
Currently the list of avoptions for URLContext is empty though,
but such options will be added.
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-24 10:33:37 +02:00
Petru Rares Sincraian
68e5976543
Refactor libavutil/parseutils.c
...
All tests were in the main method which produces a long main. Now, each test
is in his own method.
I think this produces a more clear code and follows more with the main
priority of FFmpeg "simplicity and small code size"
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-24 03:38:12 +01:00
Michael Niedermayer
fe3de6bc62
fate: Add test that also decodes packed_bframes.avi
...
No new reference samples are needed for this as the file already exists
for testing the bitstream filter
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-23 20:28:28 +01:00
Anton Khirnov
8a02a8031e
lavfi: add an NVIDIA NPP-based scaling filter
2016-03-23 19:55:34 +01:00
Mark Thompson
98114d70e4
lavf: VAAPI scale filter
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-23 19:40:15 +01:00
wm4
8bc4accc37
lavf: use new decode API
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-23 19:31:36 +01:00
wm4
35846d93e0
avconv: use new encode API
...
The flushing case is a bit strange; not simplifying it so the change is
less noisy.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-23 19:31:35 +01:00
wm4
84aea95e31
avconv: use new decode API
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-23 19:31:35 +01:00
wm4
05f66706d1
lavc: introduce a new decoding/encoding API with decoupled input/output
...
Until now, the decoding API was restricted to outputting 0 or 1 frames
per input packet. It also enforces a somewhat rigid dataflow in general.
This new API seeks to relax these restrictions by decoupling input and
output. Instead of doing a single call on each decode step, which may
consume the packet and may produce output, the new API requires the user
to send input first, and then ask for output.
For now, there are no codecs supporting this API. The API can work with
codecs using the old API, and most code added here is to make them
interoperate. The reverse is not possible, although for audio it might.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-23 19:31:23 +01:00
Rostislav Pehlivanov
a14d4c076d
vc2enc: simplify calc_slice_sizes()
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-23 18:04:05 +00:00
Rostislav Pehlivanov
a010e36f23
vc2enc: correctly zero out the slice size cache
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-23 17:52:53 +00:00
Rostislav Pehlivanov
14b41e061d
vc2enc: macro out slice size rounding
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-23 17:52:53 +00:00
Ganesh Ajjanagadde
8dbffda0f9
lavc/psymodel: check for av_malloc failure
...
No idea why in commit 01ecb7172b the
checks were removed; this can lead to NULL pointer dereferences. This
effectively reverts that portion of the commit.
Reviewed-by: Benoit Fouet <benoit.fouet@free.fr >
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-03-23 08:22:22 -07:00
Diego Biurrun
0d2fcdb1c5
opt-test: Merge struct declaration and initialization
2016-03-23 10:14:43 +01:00
Diego Biurrun
d3044cf37f
opt-test: Move some variable declarations to avoid block braces
2016-03-23 10:14:31 +01:00
Diego Biurrun
a84713e70d
parseutils-test: Move some variable declarations to avoid block braces
2016-03-23 09:35:41 +01:00
Diego Biurrun
52385410b7
des-test: Move a variable declaration to avoid an ifdef
2016-03-23 09:35:41 +01:00
Diego Biurrun
65a802401c
build: Add component for the SRTP common code
...
This allows expressing the SRTP test code dependencies more clearly.
2016-03-23 09:35:41 +01:00
Diego Biurrun
30e9ef21ce
timefilter-test: Only compile timefilter-test if JACK is enabled
2016-03-23 09:35:41 +01:00
Diego Biurrun
48362ceade
doc: Update paths to match new examples location
2016-03-23 09:35:40 +01:00
Paul B Mahol
b098e1a469
avcodec/dvaudiodec: now that we got samples, fix 12bit case
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-23 09:32:34 +01:00
Diego Biurrun
8dead2aaca
Move const qualifier before type name
2016-03-23 09:25:30 +01:00
Vittorio Giovara
d909f43b5c
vc1dec: wmv2dec: Validate ff_intrax8_common_init return value
2016-03-22 17:33:32 -04:00
Vittorio Giovara
0372e73f91
intrax8: Check and propagate errors from ff_intrax8_common_init
...
This allows dropping an afterwards redundant assert.
2016-03-22 17:33:32 -04:00
Vittorio Giovara
ad8aa8e6c6
intrax8: Move documentation from implementation to header file
2016-03-22 17:33:28 -04:00
Vittorio Giovara
2ade1cdafb
intrax8: K&R formatting cosmetics
2016-03-22 17:12:20 -04:00
Diego Biurrun
6f5ff559db
intrax8: Adjust printf conversion specifier for sizeof expression
2016-03-22 17:12:20 -04:00
Vittorio Giovara
42244ce07a
intrax8: Move a comment to the place it corresponds
2016-03-22 16:51:09 -04:00
Vittorio Giovara
750562549c
intrax8: Wrap multiline macros in do{}while(0) clauses
...
These macros are treated like functions, the wrapping simplifies error
checking and avoids deeply nested ifs in the following commit.
2016-03-22 16:51:09 -04:00
Vittorio Giovara
0c6a70873f
intrax8: Move error resilience out of intrax8
...
The intrax8 decoding process does not imply any kind of error
resilience, and the only call present is more related to how mpegvideo
works rather than anything else.
Therefore have the parent decoders carry out er when actually needed.
2016-03-22 16:51:09 -04:00
Vittorio Giovara
709c0f79d8
nuv: Use the correct context for av_image_check_size
2016-03-22 16:51:09 -04:00
Vittorio Giovara
64250d94b7
indeo4: Consistently initialize variables
...
Avoid using multiple variables for the same purpose.
2016-03-22 16:04:01 -04:00
Vittorio Giovara
6202e2fede
indeo4: Rework stream analysis report
...
* Change log level from error to debug
* Print report after the first decoded frame, not at the end of decoding
* Drop macro guard and use a context variable instead
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-03-22 16:03:52 -04:00
Rodger Combs
65cff81453
lavc: add AudioToolbox encoders
...
Fixes trac #4828
2016-03-22 12:43:14 -05:00
Rodger Combs
d5d328059e
lavc: add AudioToolbox decoders
...
Part of trac #4828
2016-03-22 12:43:14 -05:00
Ganesh Ajjanagadde
db1a642cd2
all: move ff_exp10, ff_exp10f, ff_fast_powf to lavu/ffmath.h
...
The idea is to use ffmath.h for internal implementations of math functions.
Currently, it is used for variants of libm functions, but is by no means
limited to such things.
Note that this is not exported; use lavu/mathematics for such purposes.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-03-22 10:15:31 -07:00
Petru Rares Sincraian
124526ba1a
Added a selftest to libavutil/display.c
...
- Check if av_display_rotation_get() gets the correct degrees
- Check if av_display_rotation_set() sets the correct matrix
- Check if av_display_matrix_flip() changes correct the matrix
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-22 17:24:55 +01:00
Rostislav Pehlivanov
2aebdfb451
vc2enc: add non-experimental support for all video formats from spec
...
Until now, for formats which were in the spec but not in the encoder's
list of supported formats required the -strict -1 flag. This enables
support for all video formats which are specified, all the way from
QSIF525 to 8K.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-22 14:07:56 +00:00
Michael Niedermayer
914ad90edd
swresample/swresample: Remove "less than" comparissions of enums
...
Found-by: wm4
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-22 14:20:12 +01:00
Carl Eugen Hoyos
ef888de1c1
lavf/img2dec: Skip COM when auto-detecting jpeg.
...
It could theoretically contain invalid data that gets ignored by decoders.
2016-03-22 11:13:24 +01:00
Michael Niedermayer
14478b6c38
fate: add audiomatch
...
Testset provided by Justin Greer <justin@zencoder.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-22 09:42:05 +01:00
Carl Eugen Hoyos
30d1213ecd
configure: Remove (b)zlib and iconv dependencies for videoltoolbox encoder.
2016-03-22 01:30:33 +01:00
Thomas Volkert
b4f32c42ab
rtpdec: support for VC-2 HQ RTP payload format (draft v1)
2016-03-22 00:17:12 +01:00
Lukasz Marek
df34b70098
ffplay: remove redundant silence buffer
...
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com >
2016-03-22 00:04:21 +01:00
Michael Niedermayer
6e65b9bb1f
avformat/utils: scan a bit farther for a keyframe in mpeg/mpegts (7 sec instead of 5, we already scan 90sec in some cases by default)
...
Fixes Ticket5305
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-21 20:46:29 +01:00
Rostislav Pehlivanov
d4773c94a6
vc2enc: simplify count_hq_slice() and caching
...
The count_hq_slice() function is always used with a SliceArgs struct
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-21 11:04:49 +00:00
Rostislav Pehlivanov
500dc20dee
vc2enc: fix segfault
...
Fixes trac bug #5353
Uninitialized memory for the initial quantization index
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-21 11:01:01 +00:00
Neil Birkbeck
e7e5c5e6c4
lavf/matroskaenc.c: add early support for colour elements
...
Adding early support for a subset of the proposed colour elements
according to the latest version of spec:
https://mailarchive.ietf.org/arch/search/?email_list=cellar&gbt=1&index=hIKLhMdgTMTEwUTeA4ct38h0tmE
Like matroskadec, I've left out elements for pix_fmt related things
as there still seems to be some discussion around these.
The new elements are exposed under strict experimental mode.
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-21 00:10:18 +01:00
Paul B Mahol
8f66a2da38
avfilter/vf_vectorscope: always flip output vertically
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-20 21:10:45 +01:00
Marton Balint
65efcaeb84
avformat/mov: read start_pad from edit list start time if codec is aac
...
Related to ticket #2324 , #2325 .
Stream duration still need to be fixed...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-20 19:51:28 +01:00
Marton Balint
25f707694c
avformat/utils: increase detected start_time with skip_samples
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-20 19:51:05 +01:00
Marton Balint
48a96383fa
tests/gapless: add gapless aac tests
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-20 19:50:15 +01:00
Clément Bœsch
8284a4ba11
lavf/dv: use c->sys->frame_size in dv_frame_offset()
...
dv_frame_offset() is static and called only from dv_read_seek(), where
c->sys->frame_size is already used.
This simplifies the incoming codecpar merge where
avctx->{coded_width,coded_height,time_base} are not accessible anymore.
2016-03-20 19:28:15 +01:00
Clément Bœsch
6c0cf11f38
lavf/dv: reindent after previous commit
2016-03-20 19:28:15 +01:00
Clément Bœsch
35ba5c424b
lavf/dv: do not check for c->sys
...
dv_extract_video_info() is a static function called only from
avpriv_dv_produce_packet(), where c->sys is made sure to be set.
2016-03-20 14:25:16 +01:00
Michael Niedermayer
7916f04b89
ffplay: Remove "&& 0" from already disabled debug code
...
Reviewed-by: Marton Balint <cus@passwd.hu >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-20 11:22:53 +01:00
Paul B Mahol
50f4b64c54
avfilter/vf_waveform: set color range for output frames
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-20 10:00:53 +01:00
Anton Khirnov
4426540f0c
avconv: switch to the new BSF API
2016-03-20 08:15:01 +01:00
Anton Khirnov
33d18982fa
lavc: add a new bitstream filtering API
...
Deprecate the current bitstream filtering API.
2016-03-20 08:15:01 +01:00
Andreas Cadhalpun
a2d1922bde
takdec: ensure chan2 is a valid channel index
...
If chan2 is not smaller than the number of channels, it can cause
segmentation faults due to dereferencing a NULL pointer.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-03-20 01:04:12 +01:00
Luca Barbato
9765549f55
mpegts: Forward the errors on mpeg4 objects parsing
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-03-20 01:04:12 +01:00
Michael Niedermayer
0ffa9e6eba
avformat/utils: Do not wait for more than 1 frame on attachments
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 22:58:34 +01:00
Michael Niedermayer
92dfeb5c31
avformat/wtvdec: Set AVFMTCTX_NOHEADER
...
Needed for noStreams.wtv unless something else forces continued parsing (like looking for more than 1
frame in attachments)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 22:58:34 +01:00
Paul B Mahol
959c7dad88
avfilter/vf_waveform: add graticule to aflat filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-19 21:47:15 +01:00
Paul B Mahol
c91b20c464
avfilter/vf_waveform: add subsampling input support for remaining filters
...
Remove achroma filter, as same output can be done with lowpass filter
and multiple components with overlay display.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-19 21:18:35 +01:00
Michael Niedermayer
efa98cdc2f
avformat/file: Add crypto to default whitelist
...
Fixes Ticket5287
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 18:56:59 +01:00
Michael Niedermayer
068026b0f7
avcodec/mjpegenc_common: Store approximate aspect if exact cannot be stored
...
Fixes Ticket5244
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 16:00:11 +01:00
Mark Thompson
07a844f32e
lavfi: generic hardware surface upload and download filters
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-19 15:41:04 +01:00
Mark Thompson
551c6775ab
lavu: VAAPI hwcontext implementation
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-19 15:40:22 +01:00
Mark Thompson
d264c720f7
lavu: deprecate AV_PIX_FMT_VAAPI_*, replace with AV_PIX_FMT_VAAPI
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-19 15:40:22 +01:00
Mark Thompson
b1f01e85a9
lavu: add a way to query hwcontext frame constraints
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-19 15:38:00 +01:00
Michael Niedermayer
48bda6c5f7
avfilter/vf_detelecine: Remove redundant declaration
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 12:26:14 +01:00
Mark Thompson
fbec157ea0
lavc/hevc: Allow arbitrary garbage in bytestream as long as at least one NAL unit is found.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 12:25:24 +01:00
Benjamin Steffes
c411e90bc3
Fix start_frame handling in detelecine filter
...
Signed-off-by: Benjamin Steffes <benjaminst123@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 03:58:47 +01:00
Benjamin Steffes
be482e5165
Fix detelecine filter for patterns containing 1
...
Signed-off-by: Benjamin Steffes <benjaminst123@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-19 03:58:47 +01:00
Clément Bœsch
7af3f27008
lavf/srtdec: do not be strict wrt timing digit lengths
...
Fixes a sample with 3-length digits for the seconds reported by wm4.
2016-03-18 16:42:07 +01:00
Ganesh Ajjanagadde
bccc81dfa0
lavc/aacenc_utils: replace powf(x,y) by expf(logf(x), y)
...
This is ~2x faster for y not an integer on Haswell+GCC, and should
generally be faster due to the fact that anyway powf essentially does
this under the hood. Made an inline function in lavu/internal.h for this
purpose.
Note that there are some accuracy differences, that should generally be
negligible. In particular, FATE still passes on this platform.
Results in ~ 7% speedup in aac encoding with -march=native, Haswell+GCC.
before:
ffmpeg -i sin.flac -acodec aac -y sin_new.aac 6.05s user 0.06s system 104% cpu 5.821 total
after:
ffmpeg -i sin.flac -acodec aac -y sin_new.aac 5.67s user 0.03s system 105% cpu 5.416 total
This is also faster than an alternative approach that pulls in powf, gets rid of
the crufty NaN checks and other special cases, exploits knowledge about the intervals, etc.
This of course does not exclude smarter approaches; just suggests that
there would need to be significant work on this front of lower utility than
searches for hotspots elsewhere.
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-03-18 07:47:25 -07:00
Rostislav Pehlivanov
d6e76dd132
vc2enc_dwt: remove outdated comment
...
Support for Haar was added a month or so ago.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-18 14:42:33 +00:00
Mats Peterson
d8a1633ee4
lavf/avidec: Add blurb regarding the skipping of xxpc entries in the index
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-18 13:47:43 +01:00
Rostislav Pehlivanov
f4b30beac0
vc2enc: increase the starting value of the size scaler
...
In some cases this caused the slice size rounding to generate invalid
slice sizes and overwrite some slices.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-18 11:55:48 +00:00
Paul B Mahol
93c6c52ad7
avfilter/vf_waveform: add subsampled input support for (a)color filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-18 11:08:32 +01:00
Michael Niedermayer
a7b8a6e704
avcodec/error_resilience: remove unneeded and disabled code
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-18 03:11:16 +01:00
Michael Niedermayer
5694b28211
avcodec/error_resilience: wait for previous frame to be available
...
This is possibly redundant but its more correct
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-18 03:10:16 +01:00
James Almer
488e6409df
libwebpenc_animencoder: add missing braces to struct initialization
...
The first member of the WebPAnimEncoderOptions struct is non scalar
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-17 21:46:06 -03:00
Michael Niedermayer
83df0a84a9
avcodec/motion_est_template: Fix map cache use in qpel_motion_search()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-17 16:59:37 +01:00
Michael Niedermayer
7660c135a3
avformat/segment: Fix "occured" typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-17 16:50:15 +01:00
James Almer
f875ba4873
libwebpenc_animencoder: print library messages in verbose log levels
...
Reviewed-by: James Zern <jzern@google.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-17 11:15:09 -03:00
James Almer
626b6b769c
libwebpenc_animencoder: zero initialize the WebPAnimEncoderOptions struct
...
This zeroes the WebPAnimEncoderOptions.verbose field, silencing library info messages
printed to stderr.
Reviewed-by: James Zern <jzern@google.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-17 11:13:59 -03:00
Michael Niedermayer
6b7ce0ea0d
avformat/avio: Fix unknown protocol handling
...
Fixes regression since bb8cc89b29
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-17 02:09:39 +01:00
Benjamin Steffes
06267afe1c
Fix detelecine filter for patterns like 3444 or 33333334.
...
Signed-off-by: Benjamin Steffes <benjaminst123@gmail.com >
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at >
2016-03-16 19:58:14 +01:00
Michael Niedermayer
50ef7361cb
avcodec/resample: Remove disabled and faulty code
...
Fixes Ticket5345
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-16 19:52:01 +01:00
Hendrik Leppkes
7d9e064cc1
configure: check for SEC_I_CONTEXT_EXPIRED before enabling SChannel
...
Fixes build on mingw32, which lacks this constant.
2016-03-16 15:31:21 +01:00
Hendrik Leppkes
c198295ded
dxva2_h264: fix size alignment asserts
...
Convert them to av_assert0 in the process
2016-03-16 13:14:24 +01:00
Luca Barbato
1098f5c049
svq3: Use a separate buffer for decoding the slices
...
The AVPacket.data should be considered read-only.
2016-03-16 13:09:23 +01:00
Hendrik Leppkes
c43d485811
matroskaenc: set the actual PCM bitdepth in the header
...
The actual bitdepth can be different to the storage format (ie. sample format).
Fixes the stored bitdepth for 24-bit formats like FLAC.
2016-03-16 12:52:35 +01:00
Matt Oliver
109dfed7fc
lavc/dxva2_h264: Fix incorrect assert statement.
...
Signed-off-by: Matt Oliver <protogonoi@gmail.com >
2016-03-16 22:30:56 +11:00
Luca Barbato
73f3c8f73e
indeo2: Fix banding artefacts
...
Rename luma table to delta table and change how it is used.
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
(cherry picked from commit f8c34f4b8d )
2016-03-16 11:32:51 +01:00
Luca Barbato
522ab0b9a9
indeo2data: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
(cherry picked from commit d4066a7024 )
2016-03-16 11:32:49 +01:00
Hendrik Leppkes
eae2d89bf7
hls: handle crypto in the protocol checks
...
Fixes issue 5248
2016-03-16 10:31:41 +01:00
Hendrik Leppkes
0d4b8a2c16
hls: read protocol options through the AVIOContext
...
This reverts commit 9f9ed79d4c .
The hlsopts member was never set anywhere and always NULL, furthermore
the HLS demuxer needs to retrieve the proper options from the underlying
http protocol (cookies, user-agent, etc), so a dummy context won't help.
Instead, use the AVIOContext directly to access the options.
2016-03-16 10:31:36 +01:00
İsmail Dönmez
fa3eecf9ab
configure: Use lowercase includes/library names for schannel check.
...
Fixes cross-build on Linux with mingw-w64.
Reviewed-by: Reimar Döffinger
Reviewed-by: Hendrik Leppkes
2016-03-16 09:20:39 +01:00
Thomas Mundt
d0a9114f99
avfilter/vf_bwdif: Add yadif base information to copyright header
...
Signed-off-by: Thomas Mundt <loudmax@yahoo.de >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-16 00:05:45 -03:00
Sean McGovern
2f4a1bb9bf
cmdutils: update copyright year to 2016
...
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-03-15 20:32:27 +01:00
Stefano Sabatini
7725210e71
lavf/segment: change type of increment_tc to BOOL
2016-03-15 17:50:00 +01:00
Martin Vignali
69638517d1
lavf/segment: add increment_tc option
...
For example you can split a file, keeping a continuous timecode between
each segment:
ffmpeg -i src.mov -timecode 10:00:00:00 -vcodec copy -f segment \
-segment_time 2 -reset_timestamps 1 -increment_tc 1 target_%03d.mov
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
2016-03-15 17:44:13 +01:00
Luca Barbato
8b4b1c1eea
matroska: Support V_QUICKTIME as written in the specification
...
Check if the size is written the first 4 bytes and read the next 4
as fourcc candidate, fallback checking the initial for 4 bytes.
"The CodecPrivate contains all additional data that is stored in the
'stsd' (sample description) atom in the QuickTime file after the
mandatory video descriptor structure (starting with the size and FourCC
fields)"
CC: libav-stable@libav.org
2016-03-15 16:06:35 +01:00
Luca Barbato
92c1a83ee9
qsv: Fix loading multiple plugins
...
av_get_token does not strip the trailing separator.
2016-03-15 16:05:19 +01:00
Michael Niedermayer
7eedad946c
avcodec/mediacodec_sw_buffer: remove redundant article
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-15 15:11:57 +01:00
Matthieu Bouron
03a6ed83b0
lavc/mediacodec: remove stray empty lines
2016-03-15 10:33:16 +01:00
Matthieu Bouron
31fe3c4d23
lavc/mediacodec: fix codec_name leak
2016-03-15 10:30:51 +01:00
Paul B Mahol
a68d4bf235
avfilter/vf_waveform: add forgotten color and acolor filter to switch case
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-15 09:16:18 +01:00
Marton Balint
c3c7a879ba
avutil/dict: add warning to docs about invalidating existing entries when adding a new entry
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-15 00:55:16 +01:00
Marton Balint
a740263d7e
avutil/dict: do not realloc entries when deleting a non-existing item
...
Deleting a non-existing item should not invalidate existing entries returned
with av_dict_get.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-15 00:55:16 +01:00
Michael Niedermayer
652173f63f
avcodec/pthread_frame: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-15 00:51:58 +01:00
Marton Balint
67bef4cffa
avcodec/aactab: do not use floats for constants
...
This may improve the precision of the fixed point encoder/decoder for some
compilers and architectures.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-15 00:47:38 +01:00
Paul B Mahol
af5559ab67
avfilter/vf_waveform: add graticule for chroma and flat filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-14 23:12:43 +01:00
Michael Niedermayer
c34250178b
avfilter/af_sofalizer: Fix "warning: ISO C90 forbids mixed declarations and code"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-14 22:40:38 +01:00
Carl Eugen Hoyos
f1a3677c0f
lavf/mxfdec: Fix Canopus essence element size.
2016-03-14 16:37:48 +01:00
Carl Eugen Hoyos
58fa694978
lavf/http: Add httpproxy to the default protocol whitelist.
2016-03-14 16:33:57 +01:00
Hendrik Leppkes
a38627be6d
avcodec/cbrt_data: include avutil/libm.h to unbreak compilation on systems without cbrt
2016-03-14 15:49:34 +01:00
Paul B Mahol
29d106e751
avfilter/vf_waveform: remove mirroring from chroma filter
...
It is not really useful.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-14 13:25:10 +01:00
Paul B Mahol
9f6e63f6f2
avfilter/vf_waveform: add >8 bit support for other filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-14 13:25:10 +01:00
Matthieu Bouron
33d69a9008
lavc/ffjni: remove use of private JniInvocation API to retreive the Java VM
...
Android N will prevent users from loading non-public APIs.
Users should only rely on the av_jni_set_java_vm function to set the
Java VM.
2016-03-14 10:05:33 +01:00
Paul B Mahol
370cecc1e8
avfilter/vf_vectorscope: less aggressive memory allocation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-13 20:07:18 +01:00
Paul B Mahol
55c872146d
avfilter/vf_vectorscope: process alpha at end
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-13 19:54:25 +01:00
Paul B Mahol
8097455929
avfilter/vf_vectorscope: copy frame props, mainly for bench filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-13 19:23:44 +01:00
Reimar Döffinger
7c93f2c0b9
Move cbrt tables to separate cbrt_data(_fixed).c files.
...
Allows sharing and reusing the data between different files.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-03-13 18:15:57 +01:00
Ganesh Ajjanagadde
0c33ceda91
lavu/lfg-test: add simple sample mean, stddev checks
...
Also added a TODO to change to a proper normality test in the future.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-03-13 12:41:36 -04:00
Mats Peterson
bdc798cc8d
lavf/avienc: Clear whole tag in avi_add_ientry()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-13 16:26:39 +01:00
Mats Peterson
77bc3e1944
lavf/avienc: Add xxpc entries to index
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-13 16:06:09 +01:00
Mats Peterson
9ee5b40964
avformat/avienc: factor out avi_add_ientry()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-13 16:06:09 +01:00
Carl Eugen Hoyos
4405ff2cae
lavc/hevc_ps: Fix default display window offsets for yuv422 and yuv444.
2016-03-13 13:15:17 +01:00
Mats Peterson
ed5d295a69
lavf/riffenc: Improve spec compliance; Fix WMP playback of AVI with xxpc chunks
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-13 13:12:13 +01:00
Mats Peterson
f680c8e41a
tests/ref/vsynth: Remove unused file
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-13 13:12:12 +01:00
Paul B Mahol
912fec3e54
avfilter/vf_waveform: add acolor filter
...
Useful in combination with color filter.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-13 11:24:39 +01:00
Thomas Mundt
5024a82e95
avfilter/vf_bwdif: add x86 SIMD
...
Signed-off-by: Thomas Mundt <loudmax@yahoo.de >
2016-03-13 10:06:21 +01:00
Carl Eugen Hoyos
d11d78facb
lavc/libx265: Support GBR encoding.
2016-03-13 09:40:09 +01:00
Carl Eugen Hoyos
db4786f1cf
lavc/hevc_ps: Support GBR decoding.
2016-03-13 09:33:38 +01:00
Michael Niedermayer
58cb1fb1fe
avfilter/vf_decimate: Use the correct frame in difference calculation
...
Fixes Ticket4964
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-13 00:38:54 +01:00
Michael Niedermayer
52e7f6b17e
Revert "avfilter/vf_decimate: Check that input parameters match"
...
ill commit a better solution
This reverts commit 30fe3fd527 .
2016-03-13 00:38:54 +01:00
Paul B Mahol
4a7c705fde
avfilter/vf_vectorscope: make it possible to override colorspace
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-13 00:17:29 +01:00
Paul B Mahol
a61cd42c8d
avfilter/smptebars: fix some 75% color values
...
They where slightly off.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-12 23:52:14 +01:00
James Almer
6224dddaa7
fate: add missing dependencies for fate-h264-dts_5frames
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-12 19:14:35 -03:00
James Almer
e71096bb3a
fate: add missing h264-dts_5frames ref file
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-12 19:06:30 -03:00
Adam Kent
77e355ffb1
avformat/hlsenc: Add support for HLS PLAYLIST types EVENT and VOD
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 22:22:08 +01:00
Michael Niedermayer
4aea2c7d89
fate: Add ffprobe dependancy to fate-h264-dts_5frames
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 15:37:25 +01:00
Sasi Inguva
6fa5c8235b
fate: add test for "Fix DTS for short H264 streams"
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 15:26:26 +01:00
Sasi Inguva
895dd09671
lavf/utils: Fix DTS for short H264 streams.
...
Fill DTS if all packets have been read in avformat_find_stream_info, and still
has_decode_delay_been_guessed returns false.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 14:48:07 +01:00
Sasi Inguva
e939dde48d
avformat/utils: factor update_dts_from_pts() out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 14:47:43 +01:00
Michael Niedermayer
9d4ab1380a
Use avpriv_tempfile()
...
Should fix xvid/cache on windows with --enable-shared
May be related to Ticket 4780
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 02:08:45 +01:00
Michael Niedermayer
b4f59beeb4
avutil/file: Move av_tempfile() to avutil/file_open ff_tempfile()
...
document the issue with av_tempfile()
Tested-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 02:08:34 +01:00
Umair Khan
5d64ba9d18
avcodec/alsdec: fix max bits in ltp prefix code
...
The maximum number of bits int the prefix code for
p(0) is 4. By setting it as 3, we were missing the
last 0 bit.
This fixes bug #4715 present on the trac.
Signed-off-by: Umair Khan <omerjerk@gmail.com >
Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-12 01:56:58 +01:00
Shivraj Patil
15ef98afd1
configure: build fix for P5600 along option --disable-msa
...
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-11 23:57:06 +01:00
Paul B Mahol
817d0c6da2
avfilter/vf_waveform: add parade display mode
...
Rename old parade display mode to stacked.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-11 23:08:38 +01:00
Ronald S. Bultje
b86339a9f8
vp9: fix a few signed integer left-shifts.
...
Fixes trac tickets 5127, 5129, 5130.
2016-03-11 16:06:29 -05:00
Ronald S. Bultje
abedde65d1
vp9_superframe: fix endianness of size markers.
2016-03-11 14:23:46 -05:00
Ronald S. Bultje
2e6636aa87
vp9: add superframe merging bitstream filter.
...
Fixes ticket 4313.
2016-03-11 11:19:14 -05:00
Ronald S. Bultje
6d8ab358a3
lavf: allow BSFs to drop packets.
...
If pkt->size == 0 && pkt->side_data_elems == 0 after bsf->filter()
returns, the packet is considered dropped.
2016-03-11 11:19:10 -05:00
Luca Barbato
7e01d48cfd
mov: Check the entries value when parsing dref boxes
...
And properly reset the entries count when resetting the entries.
CC: libav-stable@libav.org
Bug-Id: 929
Bug-Id: CVE-2016-3062
2016-03-11 14:29:13 +01:00
Paul B Mahol
867637caea
avfilter/vf_waveform: fix and extend millivolts grat lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-11 10:24:51 +01:00
Paul B Mahol
119c108b31
avfilter/vf_waveform: fix ire8 for 25%
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-11 09:51:12 +01:00
Ganesh Ajjanagadde
66edd8656b
lavc/lpc: exploit even symmetry of window function
...
Yields 2x improvement in function performance, and boosts aac encoding
speed by ~ 4% overall. Sample benchmark (Haswell+GCC under -march=native):
after:
ffmpeg -i sin.flac -acodec aac -y sin_new.aac 5.22s user 0.03s system 105% cpu 4.970 total
before:
ffmpeg -i sin.flac -acodec aac -y sin_new.aac 5.40s user 0.05s system 105% cpu 5.162 total
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-03-10 21:29:56 -05:00
Michael Niedermayer
b2ab3398f5
avformat/hlsenc: Fix passing options, regression since bc9a5965c8
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-11 00:45:28 +01:00
Paul B Mahol
1a5895757d
avfilter/vf_waveform: fix indentation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-11 00:15:53 +01:00
Paul B Mahol
681f833610
avfilter/vf_waveform add support for other scalers for graticule
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-11 00:09:57 +01:00
Michael Niedermayer
2540d884f3
avutil/random_seed: Add the runtime in cycles of the main loop to the entropy pool
...
This should theoretically improve the randomness slightly
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-10 22:56:37 +01:00
Martin Cracauer
73d1398f0c
avutil/channel_layout: AV_CH_LAYOUT_6POINT1_BACK not reachable in parsing
...
Trying to make heads and tails out of DTS 6.1 I can across this typo.
I also noticed that this wiki page is incorrect or misleading, the
channel order for 6.1 given does not match the source code. At the
least it should be clarified that the layout given does not apply to
DTS. https://trac.ffmpeg.org/wiki/AudioChannelManipulation
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-10 21:24:25 +01:00
Carl Eugen Hoyos
bd2cc3c42c
lavf/movenc: Fix help output.
...
Fixes ticket #5323 .
2016-03-10 18:42:27 +01:00
Matthieu Bouron
8d0a218058
lavc/ffjni: fix uninitialized variable
2016-03-10 18:17:28 +01:00
Carl Eugen Hoyos
ac1974652b
lavf/mxfdec: Support Canopus codecs.
...
Fixes ticket #5316 .
2016-03-10 09:59:35 +01:00
Carl Eugen Hoyos
cb3f99e4d3
version.sh: Fix spurious rebuilds.
...
Regression since 104f8ea8 .
2016-03-10 09:53:10 +01:00
Michael Niedermayer
689211d572
avformat/concatdec: set safe mode to enabled instead of auto
...
This is safer, as a selected demuxer could still mean that it was auto-detected
by a user application
Reviewed-previously-by: Nicolas George <george@nsup.org >
Reviewed-previously-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-10 02:54:59 +01:00
Mats Peterson
caeed0479f
lavf/avidec: Skip xxpc entries in index; fixes trac #5311
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-10 00:30:39 +01:00
NagaChaitanya Vellanki
285fda0937
Add tests for functions in hash.c
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-09 20:05:29 +01:00
Vicente Olivert Riera
ad16eff64b
mips: add support for R6
...
Understanding the mips32r6 and mips64r6 ISAs in the configure script is
not enough. In order to have full support for MIPS R6 in FFmpeg we need
to be able to build it, and for that we need to make sure we don't use
incompatible assembler code which makes the build fail. Ifdefing the
offending code is sufficient to fix the problem.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-09 20:05:04 +01:00
Carl Eugen Hoyos
a62d768894
configure: Check for msghdr struct.
...
Some (Solaris) systems apparently have an incompatible msghdr struct
breaking sctp protocol compilation.
Reported-by: mvelanka
2016-03-09 14:17:46 +01:00
Carl Eugen Hoyos
fb9036b314
lavf/mpeg: Identify sub-stream ID 0xa1 as mlp.
...
Fixes ticket #4786 .
Auto-detection seems difficult, patch mostly confirmed by
http://dvd-audio.sourceforge.net/spec/aob.shtml
2016-03-09 14:12:18 +01:00
Carl Eugen Hoyos
260c12cdd1
lavc/mjpegdec: Set sar for multiscope videos.
...
Fixes decoding of the files from ticket #4535 visually.
2016-03-09 14:06:40 +01:00
Carl Eugen Hoyos
a6a52ef29a
lavc/hevc_ps: Fix offset for yuv422 and yuv444.
...
Fixes ticket #4980 .
Analyzed-by: kurosu and Hendrik
Reviewed-by: Ronald
2016-03-09 14:00:57 +01:00
Carl Eugen Hoyos
144ef773c7
Use correct msvc type specifiers for ptrdiff_t and size_t.
2016-03-09 14:00:22 +01:00
Paul B Mahol
953b8c5a43
avfilter/vf_waveform: use intensity for other components too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-09 11:51:20 +01:00
Michael Niedermayer
a008a7cc95
avcodec/ffjni: Fix occured typo
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-09 04:28:37 +01:00
Michael Niedermayer
89862cd734
avcodec/ffjni: Fix ;;
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-09 04:28:37 +01:00
Reimar Döffinger
b60dfae7af
aacenc_utils: Use temporary variable.
...
This ensures gcc does not create unnecessary
loads or stores and possibly even does not vectorize
the negation.
Speeds up mp3 to aac transcoding with default settings
by 10% when using "gcc (Debian 5.3.1-10) 5.3.1 20160224".
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-03-08 23:56:51 +01:00
Reimar Döffinger
b91e376390
aacenc: use generational cache instead of resetting.
...
Approximately 11% faster transcoding from mp3 with
default settings.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-03-08 23:56:51 +01:00
Paul B Mahol
b3e0371818
avfilter/vf_waveform: make it possible to draw dots instead of lines
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-08 23:14:57 +01:00
Paul B Mahol
209cff2d9c
avfilter/vf_waveform: make sure that x/y for text position is positive
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-08 22:04:57 +01:00
Shivraj Patil
8ca2c872b6
configure: build fix for P5600 with mips code restructuring
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-08 17:36:46 +01:00
Shivraj Patil
b59d06d5f4
configure: add check_inline_asm_flags()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-08 17:36:46 +01:00
Moritz Barsnick
8a90e0fd21
lavf/mp3dec: avoid printing useless message in default log level
...
"Skipping 0 bytes of junk" is useless to the user, and essentially
indicates a NOP. At 0 bytes, this message is now pushed back to
the verbose log level.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
2016-03-08 17:02:32 +01:00
Moritz Barsnick
72babb8566
lavc/mjpegdec: avoid printing useless message in default log level
...
The change of bps from 0 doesn't contain any info useful to the
user. This message is now at info log level only if the original
value is !=0, otherwise pushed back to debug log level. The
original value is displayed additionally.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-08 16:42:34 +01:00
Mats Peterson
e1aa88dc09
lavf/avienc: Palette changing code only concerns AV_PIX_FMT_PAL8
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-08 15:33:17 +01:00
Muhammad Faiz
fd0c9789cf
avfilter/avf_showcqt: add performance debugging log
...
for easier development
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-03-08 20:50:26 +07:00
Paul B Mahol
f78ef2d885
avfilter/vf_vectorscope: short for Magenta is Mg
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-08 12:12:29 +01:00
Lior Mualem
baec6d8aff
ffserver: Fixed ffserver to support large ffm files
...
ffm_read_write_index returns a 64bit value,
Github: Closes #185
2016-03-08 11:39:29 +01:00
Timo Rothenpieler
f2bdf9d26a
avcodec/nvenc: Fix typo and preset error message
2016-03-08 11:18:16 +01:00
Lucas Cooper
fd55470c65
avcodec/nvenc: Add encoder stats
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-03-08 10:41:07 +01:00
Michael Niedermayer
50615791ca
fate: Add test similar to ticket 1242
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-08 03:32:21 +01:00
Michael Niedermayer
de1de49324
avformat/utils: fix dts from pts code in compute_pkt_fields() during ascending delay
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-08 02:56:33 +01:00
Carl Eugen Hoyos
51bcc0bf38
lavf/riff: Add fourcc GTM4 from Telefactor digital audio for ASP.
2016-03-07 23:57:14 +01:00
Michael Niedermayer
da904faaa5
avcodec: try to document timebase a bit more
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-07 23:00:50 +01:00
Paul B Mahol
f20cdcbc05
avfilter/vf_vectorscope: draw color points names
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-07 22:38:13 +01:00
Clément Bœsch
2b7a61cbd8
lavc/utils: fix extra ASS sanity check in convert_sub_to_old_ass_form()
2016-03-07 21:48:55 +01:00
Luca Barbato
59b9d2f684
configure: Add support for clang llvm-cov
2016-03-07 16:59:00 +01:00
Luca Barbato
c11a858626
configure: Support msan as toolchain
2016-03-07 16:59:00 +01:00
Matthieu Bouron
8c24523cc5
lavc/mediacodec: fix chroma width for yuv420p
2016-03-07 14:41:55 +01:00
Anton Khirnov
328e9a15c5
buffer: drop a reference to a non-existing function from the docs
...
This function only ever existed in the draft versions of the API.
2016-03-07 13:57:10 +01:00
Anton Khirnov
7480d00131
pixfmt: fix the AV_PIX_FMT_VAAPI_VLD doxy
2016-03-07 13:57:02 +01:00
Paul B Mahol
f659b70eb0
avfilter/vf_waveform: draw graticule for color filter too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-07 13:27:41 +01:00
Clément Bœsch
920f592b81
lavf/vplayerdec: support time durations with no ms specified
...
Example found in the wild:
0:00:03:25.000
0:01:47:A legend is sung
0:01:50:Of when England was young
0:01:53:And knights|were brave and bold
0:01:59:The good king had died
Reported-by: wm4
2016-03-07 12:52:11 +01:00
Matthieu Bouron
81f14884b5
lavc/mjpegdec: avoid unneeded allocation if the frame is to be skipped
2016-03-07 12:36:23 +01:00
Carl Eugen Hoyos
bba9bed3f3
lavfi/extractplanes: Add RGB0 and friends as supported pix_fmts.
2016-03-07 12:05:42 +01:00
Carl Eugen Hoyos
0ba844a053
lavfi/extractplanes: Fix in_pixfmts.
...
If the original pix_fmt was >8 bit and not supported by the filter,
the filter system could choose a pix_fmt with different endianness
as input for extractplanes which broke the output because the output
always used the endianness of the original pix_fmt.
2016-03-07 11:59:36 +01:00
Carl Eugen Hoyos
b872b98bb4
lavfi/extractplanes: Move endianness calculation up.
...
Needed for next commit.
2016-03-07 11:54:37 +01:00
Matthieu Bouron
4737fe6907
lavc: add h264 mediacodec decoder
2016-03-07 11:28:29 +01:00
Matthieu Bouron
3ab178516e
lavc: add JNI support
2016-03-07 11:17:31 +01:00
Zhao Zhili
6f5048f4a0
rtp: Fix play multiple multicast streams with the same port
...
We cannot play multiple multicast streams with the same port at the
same time. This is because both rtp and rtcp port are opened in
read-write mode, so they will not bind to the multicast address. Try
to make rtp port as read-only by default to solve this bug.
Signed-off-by: Zhao Zhili <wantlamy@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-07 02:29:41 +01:00
Raymond Hilseth
86db71b402
avformat/ftp: Support response code 125 for STOR and RETR commands
...
This fixes a problem where ffmpeg would hang if there is already an open
data connection, and the server sends a 125 response code in reply to a
STOR or RETR command.
Signed-off-by: Raymond Hilseth <rhi@vizrt.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-07 02:13:13 +01:00
Carl Eugen Hoyos
e356487fda
lavf/img2dec: Use jpeg constants in jpeg_probe().
2016-03-06 22:28:22 +01:00
Carl Eugen Hoyos
aebfbe5c13
lavf/riffdec: Remove \n from avpriv_report_missing_feature().
...
Found-by: Clément Bœsch
2016-03-06 21:39:57 +01:00
Carl Eugen Hoyos
59793785f4
lavc/cfhd: Remove one more \n from avpriv_report_missing_feature().
2016-03-06 21:38:41 +01:00
Carl Eugen Hoyos
719276b860
lavc/cfhd: Sanitize avpriv_report_missing_feature() usage.
2016-03-06 21:22:47 +01:00
Boris Nagels
1109ed7973
avformat/rtpenc: Fix integer overflow in NTP_TO_RTP_FORMAT
...
RTCP synchronization packet was broken since commit in ffmpeg version > 2.8.3
(commit: e04b039b15 ) Since this commit (2e814d0329 )
"rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps", NTP_TO_RTP_FORMAT
uses av_rescale_rnd() function to add the data to the packet.
This causes an overflow in the av_rescale_rnd() function and it will return INT64_MIN.
Causing the NTP stamp in the RTCP packet to have an invalid value.
Github: Closes #182
Reverting commit '2e814d0329aded98c811d0502839618f08642685' solves the problem.
2016-03-06 21:19:18 +01:00
Paul B Mahol
6e19120ea2
avfilter/vf_vectorscope: add 12bit depth support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-06 20:29:23 +01:00
Paul B Mahol
02f8421546
avfilter/vf_histogram: add 12bit depth support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-06 19:55:02 +01:00
foo86
db44b59980
avcodec/dca: clear X96 channels if nothing was decoded
...
The first X96 channel set can have more channels than core, causing X96
decoding to be skipped. Clear the number of decoded X96 channels to zero
in this rudimentary case.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-06 18:24:20 +01:00
erankor
dd34e89f31
mov - support seek in encrypted mp4
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-06 17:29:32 +01:00
Paul B Mahol
23d8b79a18
avfilter/vf_waveform: add text to graticule
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-06 16:48:05 +01:00
Paul B Mahol
5451be50a8
avfilter/vf_waveform: use nonsubsampled yuv output format for lowpass filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-06 16:48:05 +01:00
Kieran Kunhya
247fe3e494
avcodec/cfhd: Fixes cfhd_odd.mov which has a resolution of 496x241
...
In this case container width/height is better however.
Thanks to koda for the sample
2016-03-06 12:38:07 +00:00
Umair Khan
7d6c264e02
avcodec/alsdec: treat quant_cof as a signed value
...
Signed-off-by: Umair Khan <omerjerk@gmail.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-06 13:11:29 +01:00
Reimar Döffinger
5f5e6033cd
bitstream.c: improve init_vlc error messages.
...
Makes it far easier to spot the issue if e.g.
caused by a typo in the code table.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-03-06 12:31:40 +01:00
Michael Niedermayer
40aeff5f02
avformat/avienc: Remove unneeded seekable tests
...
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-06 12:21:02 +01:00
Reimar Döffinger
0a04c2885f
aacenc: avoid double in quantize_bands.
...
I cannot see any point whatsoever to use
double here instead of float, the results
are likely identical in all cases..
Using float allows for much more
efficient use of SIMD.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-03-06 11:49:19 +01:00
Muhammad Faiz
7dd60a0b54
avfilter/avf_showcqt: remove CoeffsType
...
seems not useful
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-03-06 16:36:37 +07:00
Mark Harris
238ddd6482
avformat/dump: Fix context/level for payload dump
...
Use the context and level specified to av_pkt_dump_log2(),
instead of panic level (0), for dumping packet payload.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-06 03:32:04 +01:00
Michael Niedermayer
c78a726717
fate/aac: Increase fuzz from of fate-aac-pns-encode from 72 to 74 for Loongson
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 22:38:14 +01:00
Paul B Mahol
361e48f0ed
avfilter/vf_waveform: add graticule support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-05 22:33:01 +01:00
Paul B Mahol
f3c00be2a3
avfilter/vf_waveform: only use available components
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-05 20:22:35 +01:00
Michael Niedermayer
e0f5f9267a
avformat/avienc: assert that bits_per_coded_sample is within the supported range (out of array access otherwise)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 18:18:07 +01:00
Michael Niedermayer
76019f5fed
fate: Add pal8 copy test for avi
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 18:05:47 +01:00
Mats Peterson
2df0bbaca5
lavf/avienc: Add support for palette side data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 18:05:47 +01:00
Mats Peterson
698fdc8547
lavf/riffenc: Handle palette for non-raw codecs
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 18:05:47 +01:00
Luca Barbato
39a2d3288e
mpegvideo: Refactor emulated_edge_mc calls
2016-03-05 08:26:36 -05:00
Luca Barbato
0242351390
mpegvideo: Fix undefined negative shifts in mpeg_motion_internal
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-03-05 08:26:36 -05:00
Luca Barbato
7d4a1ff344
mpegvideo: Fix undefined negative shifts in ff_init_block_index
...
Found-by: gcc5-ubsan.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-03-05 08:26:36 -05:00
Katerina Barone-Adesi
1389b4c18d
idct8x8: Fix undefined negative shifts
...
The original code left-shifts negative values, which is undefined
in the C99 specification (the one used during normal Libav compilation).
This change multiplies by (1 << shift), which is functionally equivalent,
but has defined behavior.
With this change, fate-idct8x8 compiled with --fsanitize=undefined works.
Bug-Id: 686
2016-03-05 08:26:36 -05:00
Vittorio Giovara
e10b7ef2fe
vdpau: Add missing deprecation guards
2016-03-05 08:23:18 -05:00
Vittorio Giovara
d40cb726d2
mov: Trim dref absolute path
...
Samples produced by Omneon (Harmonic) store external references with
paths ending with 0s. Such movs cannot be loaded properly since every
0 is converted to '/', to keep the same parsing code for dref type 2
and type 18: this makes the external reference point to a non-existing
direactory, rather than to the actual referenced file.
Add a brief trimming loop that drops all ending 0s before trying to
parse the external reference path.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-03-05 08:23:18 -05:00
Clément Bœsch
0443b2cf79
lavc: restore ABI compatibility with 3.x (sub_text_format)
...
Regression introduced in 2941282 .
Reported-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 10:15:35 +01:00
wm4
0b6e5d6b32
avconv: remove sub-frame warning
...
It's not practical to keep this with the new decode API.
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-05 09:10:10 +01:00
wm4
2e2f8534eb
lavc: factor apply_param_change() AV_EF_EXPLODE handling
...
Remove the duplicated code for handling failure of apply_param_change().
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-05 09:04:03 +01:00
wm4
7a6cf27714
lavu: improve documentation of some AVFrame functions
...
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-03-05 09:03:28 +01:00
Anton Khirnov
84b5dcf275
asfenc: remove an unused variable
2016-03-05 08:45:01 +01:00
Anton Khirnov
ff3db937ef
asfenc: fix some possible integer overflows
...
Store the file duration in the same timebase it arrives (i.e.
milliseconds) and only convert it to the file duration units (100ns)
when it's actually written, thus simplifying some calculations. Also,
store the duration as unsigned, since it cannot be negative.
CC: libav-stable@libav.org
Bug-ID: CVE-2016-2326
2016-03-05 08:43:04 +01:00
James Almer
a3659ca014
avcodec/cos_tablegen: extend table generation to 17bits
...
Fixes compilation of fft with hardcoded tables
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-05 00:39:53 -03:00
Michael Niedermayer
b3dc51dd57
avfilter/f_bench: Fix comparission condition
...
Fixes: CID1355115
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 02:04:57 +01:00
Michael Niedermayer
dec816f92c
avcodec/utils: Fix memleak on error in convert_sub_to_old_ass_form()
...
Fixes CID1355116
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-05 01:50:32 +01:00
Rostislav Pehlivanov
c45b1aa824
vc2enc: minor cosmetic changes
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-04 22:41:20 +00:00
Rostislav Pehlivanov
f21cf2b383
vc2enc: remove useless alignment on slice encoding
...
This was a leftover from before the slices were encoded in parallel.
Since the put_bits context is initialized per slice aligning it
aferwards is pointless.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-04 22:41:15 +00:00
Rostislav Pehlivanov
b88be742fa
vc2enc: do not allocate packet until exact frame size is known
...
This commit solves most of the crashes and issues with the encoder and
the bitrate setting. Now the encoder will always allocate the absolute
lowest amount of memory regardless of what the bitrate has been set to.
Therefore if a user inputs a very low bitrate the encoder will use the
maximum possible quantization (basically zero out all coefficients),
allocate a packet and encode it. There is no coupling between the
bitrate and the allocation size and so no crashes because the buffer
isn't large enough.
The maximum quantizer was raised to the size of the table now to both
keep the overshoot at ridiculous bitrates low and to improve quality
with higher bit depths (since the coefficients grow larger per transform
quantizing them to the same relative level requires larger quantization
indices).
Since the quantization index start follows the previous quantization
index for that slice, the quantization step was reduced to a static 1
to improve performance. Previously with quant/5 the step was usually
set to 0 upon start (and was later clipped to 1), that isn't a big change.
As the step size increases so does the amount of bits leftover and so
the redistribution algorithm has to iterate more and thus waste more
time.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-04 22:40:58 +00:00
Neil Birkbeck
3c658e2655
lavf/dump.c: Print mastering display metadata
...
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 23:11:51 +01:00
Neil Birkbeck
bbda13a771
lavf/matroskadec: Add early support for some of the new colour elements.
...
Adding early support for a subset of the proposed colour elements
according to the latest version of spec:
https://mailarchive.ietf.org/arch/search/?email_list=cellar&gbt=1&index=hIKLhMdgTMTEwUTeA4ct38h0tmE
I've left out elements for pix_fmt related things as there still
seems to be some discussion around these, and the max_cll/max_fall
are currently not propagated as there is not yet side data for them.
The new elements are exposed under strict experimental mode.
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 23:11:51 +01:00
Paul B Mahol
ac15d7a666
avfilter/vf_histogram: explicitly set 10bit output formats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-04 23:09:41 +01:00
Timo Rothenpieler
95a5fd4581
configure: NVENC API version 6 is now required
2016-03-04 23:03:14 +01:00
Paul B Mahol
f81c81cc3a
avfilter/af_afftfilt: add option for 17 fft case
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-04 22:20:12 +01:00
Paul B Mahol
781195fa62
avfilter/af_sofalizer: check if filename was set.
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-04 22:14:43 +01:00
Derek Buitenhuis
fb2f164598
avformat: Fix member name 10L
...
The wrong member was remove/moved after review of the blacklist API.
10L cola.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-04 16:33:10 +00:00
Derek Buitenhuis
61c554bd5f
Merge commit '257b30af8ec520c1635092e429606c62d3bcca63'
...
This commit is a no-op. We already have these, plus our asm differs.
* commit '257b30af8ec520c1635092e429606c62d3bcca63':
x86: hevc: Fix linking with both yasm and optimizations disabled
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-04 16:22:43 +00:00
Derek Buitenhuis
89790ba2bf
Merge commit 'cd846b47977485bd4063e77a3324e6b7840567a2'
...
* commit 'cd846b47977485bd4063e77a3324e6b7840567a2':
fate: Ignore errors from concatenating report files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-04 16:19:57 +00:00
Derek Buitenhuis
18d8398caf
Merge commit '9328adcc8012a1b0e00c465c85b5453589a4f5f7'
...
* commit '9328adcc8012a1b0e00c465c85b5453589a4f5f7':
fate: Be silent when fetching Git updates
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-04 16:18:32 +00:00
Derek Buitenhuis
a38eadd7e9
Merge commit '5e555f93009f0605db120eec78262d0fe337e645'
...
AVClass is now a const, the rest are no-op.
* commit '5e555f93009f0605db120eec78262d0fe337e645':
mpeg12enc: always write closed gops for intra only outputs
h264: Add an AVClass pointer to H264Context
libx264: Fix noise_reduction option assignment
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-04 16:17:05 +00:00
Derek Buitenhuis
063b26d358
Merge commit 'ec4c48397641dbaf4ae8df36c32aaa5a311a11bf'
...
This is a no-op. API is already implemented by us.
* commit 'ec4c48397641dbaf4ae8df36c32aaa5a311a11bf':
lavf: add a protocol whitelist/blacklist for file opened internally
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-04 16:14:53 +00:00
Derek Buitenhuis
93629735d7
avformat: Add a protocol blacklisting API
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-04 16:13:42 +00:00
Michael Niedermayer
500cb98471
avfilter/af_afftfilt: Extend to 17bit fft
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 16:05:47 +01:00
Michael Niedermayer
305344d89e
avcodec/fft: Add revtab32 for FFTs with more than 65536 samples
...
x86 optimizations are used only for the cases they support (<=65536 samples)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 16:05:47 +01:00
Michael Niedermayer
ae76b84221
avcodec: Extend fft to size 2^17
...
Asked-for-by: durandal_1707
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 13:51:42 +01:00
Agatha Hu
362e05f1ea
avcodec/nvenc: Fix H264 and HEVC vui info update
...
Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org >
2016-03-04 10:49:33 +01:00
Paul B Mahol
79a54f30c8
avfilter/af_sofalizer: fix crash when ir size is not aligned, usually when n_samples are not power of 2
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-04 10:38:40 +01:00
Anton Khirnov
1ceb07eb31
avformat_find_stream_info: move duration guessing after updating codec parameters
...
This bitrate might not be known otherwise.
Bug-Id: 926
2016-03-04 08:26:34 +01:00
Michael Niedermayer
2761e250cc
fate: add qtrle/mace6 stream copy test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 04:36:27 +01:00
Mats Peterson
5111c1bef3
lavf/movenc: Add support for palette side data
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 04:02:27 +01:00
Mats Peterson
ba40b3520d
lavf/utils: Normalize AVPacket.data to native endian in ff_get_packet_palette()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-04 04:02:19 +01:00
Paul B Mahol
21234c835d
avfilter/af_sofalizer: fix crash with odd IR size
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-03 23:59:58 +01:00
Paul B Mahol
3e491a1fb6
avfilter/af_sofalizer: print size of FFT that failed to init
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-03 23:59:58 +01:00
Michael Niedermayer
966eadeab3
avfilter/vf_ciescope: Fix 'ISO C90 forbids mixed declarations and code'
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 21:20:08 +01:00
Michael Niedermayer
fbfd2601f6
avcodec/utils: Fix 'ISO C90 forbids mixed declarations and code'
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 21:19:54 +01:00
Michael Niedermayer
9b0eabdcdf
avutil/color_utils: Mark test_data as static const
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 21:17:45 +01:00
Paul B Mahol
5e9f85925c
avfilter/vf_vectorscope: improve green graticule visibility
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-03 21:05:39 +01:00
Paul B Mahol
768734a0ff
avfilter/vf_vectorscope: add threshold option
...
Useful to only display lows/mids/highs.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-03 21:05:39 +01:00
NagaChaitanya Vellanki
df4b5f076e
Add test for avpriv_get_trc_function_from_trc function
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 21:03:04 +01:00
Derek Buitenhuis
510046c228
Merge commit '8c0ceafb0f25da077ff23e394667119f031574fd'
...
This commit is a no-p. We already have a mechanism to do this.
* commit '8c0ceafb0f25da077ff23e394667119f031574fd':
urlprotocol: receive a list of protocols from the caller
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-03-03 16:12:35 +00:00
Michael Niedermayer
ba687ae0bd
ffmpeg_vdpau: Free ctx on error path
...
Fixes CID1355118
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 16:41:11 +01:00
Michael Niedermayer
50208a0424
avfilter/vf_ciescope: Fix "incompatible pointer type" warnings
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 16:41:11 +01:00
James Almer
0786b28425
fate: fix filter-hls tests dependencies
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-03-03 12:31:28 -03:00
Paul B Mahol
f5f34ee0de
avfilter/vf_zscale: unbreak RGB support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-03 13:28:25 +01:00
foo86
00e3717b4a
avcodec/dca: simplify condition
...
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 12:35:21 +01:00
foo86
8981348749
avcodec/dca: fix av_cold placement in declarations
...
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-03 12:35:21 +01:00
Paul B Mahol
256fa2ab1b
avfilter: add ciescope filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-03 12:26:44 +01:00
Carl Eugen Hoyos
8653d6e1a6
lavfi/drawutils: Add some missing GBRP pix_fmts.
...
Fixes for example extractplanes with GBRAP16.
2016-03-03 11:15:30 +01:00
Paul B Mahol
dd2ea5cbfb
avformat/yuv4mpegdec: fix seeking for partial files
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-03 09:28:15 +01:00
Rodger Combs
ecba35bbe3
lavc/videotoolboxenc: remove *_NULLABLE annotations; fixes pre-10.11 build
...
These macros were added in OS X 10.11, and the file compiles without warnings
on both 10.10 and 10.11 with them removed.
Thanks to mark4o on IRC for pointing out the failure and testing the patch.
2016-03-02 21:44:28 -06:00
Michael Niedermayer
38cd60c921
fate: add filter-hls
2016-03-03 04:02:32 +01:00
Marton Balint
0418b0253a
ffmpeg: remove hardcoded 'now' creation_time support
...
Every date parsing routine now uses av_parse_time which handles 'now' and
provides greater precision as well. This change also enables the segmenter
muxer to set the proper 'now' creation time at the beginning of each segment.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-03 01:37:22 +01:00
Marton Balint
28fbdece79
avformat: use ff_standardize_creation_time for formats writing all format string metadata
...
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-03 01:37:18 +01:00
Marton Balint
e7dd97b5d8
avformat/utils: add a function to standardize creation time
...
This can be used for formats which write all format metadata as string to
files, therefore non-standard creation times such as 'now' will be parsed.
The standardized creation time is UTC ISO 8601 with microsecond precision.
Reviewed-by: wm4 <nfxjfg@googlemail.com >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-03-03 01:37:12 +01:00
Rick Kern
3af71ac3f9
lavc: add VideoToolbox H.264 Encoder
...
Autodetected by default. Encode using -codec:v h264_videotoolbox.
Signed-off-by: Rick Kern <kernrj@gmail.com >
Signed-off-by: wm4 <nfxjfg@googlemail.com >
2016-03-02 21:19:35 +01:00
Mats Peterson
2be0366a7f
lavf/utils: Add ff_get_packet_palette()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-02 18:11:18 +01:00
Michael Niedermayer
554f6e930c
avformat/cache: Fix memleak of tree entries
...
Found-by: jamrial
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-02 14:27:57 +01:00
Clément Bœsch
24a189e016
fate/api: add missing FLV dependency to fate-api-seek
2016-03-02 13:52:02 +01:00
Paul B Mahol
5afe918336
avfilter/vf_vectorscope: add 9 & 10 bit depth input & output support with alpha
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-02 12:30:30 +01:00
Paul B Mahol
bdf474bcff
doc/utils: fix typo for min() description
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-02 11:20:07 +01:00
Paul B Mahol
29c6fd41fc
avfilter/vf_vectorscope: make background opacity customizable
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-02 09:40:41 +01:00
Paul B Mahol
a7897bd3a6
avfilter/vf_vectorscope: add graticule
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-02 09:40:41 +01:00
Paul B Mahol
85dd497baa
avfilter/vf_vectorscope: avoid crash by explicitly checking for 8-bit depth
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-03-02 09:40:41 +01:00
Ganesh Ajjanagadde
bd9c58756a
lavc/aacenc_utils: replace sqrtf(Q*sqrtf(Q)) by precomputed value
...
It makes no sense whatsoever to do this at each function call; we
already have a table for this.
Yields a 2x improvement in find_min_book (x86-64, Haswell+GCC):
ffmpeg -i sin.flac -acodec aac -y sin.aac
find_min_book
old
605 decicycles in find_min_book, 8388453 runs, 155 skips.9x
606 decicycles in find_min_book,16776912 runs, 304 skips.9x
607 decicycles in find_min_book,33553819 runs, 613 skips.2x
607 decicycles in find_min_book,67107668 runs, 1196 skips.3x
607 decicycles in find_min_book,134215360 runs, 2368 skips3x
new
359 decicycles in find_min_book, 8388552 runs, 56 skips.3x
360 decicycles in find_min_book,16777112 runs, 104 skips.1x
361 decicycles in find_min_book,33554218 runs, 214 skips.4x
361 decicycles in find_min_book,67108381 runs, 483 skips.5x
361 decicycles in find_min_book,134216725 runs, 1003 skips5x
and more importantly a non-negligible speedup (~ 8%) to overall AAC encoding:
old:
ffmpeg -i sin.flac -acodec aac -strict -2 -y sin_new.aac 6.82s user 0.03s system 104% cpu 6.565 total
new:
ffmpeg -i sin.flac -acodec aac -strict -2 -y sin_old.aac 6.24s user 0.03s system 104% cpu 5.993 total
This also improves accuracy of the expression by ~ 2 ulp in some cases.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-03-01 22:57:44 -05:00
Michael Niedermayer
5324882529
fate: add pipe and cache test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-02 02:12:56 +01:00
Michael Niedermayer
a870aa89bf
avformat/seek-test: Support passing options to demuxers and protocols
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-02 02:12:56 +01:00
Carl Eugen Hoyos
2355b7458e
lavf/mov: Set display aspect ratio for avid dv.
...
Fixes ticket #5271 .
2016-03-02 02:03:46 +01:00
Diego Biurrun
11843ededa
fate: Add separate target for all indeo3 tests
2016-03-01 21:54:10 +01:00
Vittorio Giovara
b39ab8549a
fate: Add test for indeo2 with delta frames
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-03-01 21:54:08 +01:00
Mark Harris
c3bb6166dd
sdp: fix opus sprop-stereo fmtp syntax
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-01 20:52:33 +01:00
Wan-Teh Chang
4845f0720e
Move the |die| member of FrameThreadContext to PerThreadContext.
...
This fixes a data race warning by ThreadSanitizer.
FrameThreadContext.die is read by all the worker threads but is not
protected by any mutex. Move it to PerThreadContext so that each worker
thread reads its own copy of |die|, which can then be protected with
PerThreadContext.mutex.
Signed-off-by: Wan-Teh Chang <wtc@google.com >
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com >
2016-03-01 13:53:47 -05:00
Clément Bœsch
f1148390d7
sws/aarch64: add {nv12,nv21,yuv420p,yuv422p}_to_{argb,rgba,abgr,rgba}_neon
2016-03-01 17:53:33 +01:00
Rostislav Pehlivanov
7bcc57ad99
vc2enc: fix packet underallocation and minimum bitrate with interlacing
...
This was a regression introduced by commit e7345abe05 which
enabled full use of the allocated packet but due to the overhead of
using field coding the buffer was too small and triggered warnings and
crashes.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-01 13:44:18 +00:00
Rostislav Pehlivanov
41985d40c6
vc2enc: simplify slice cost caching
...
The fact that now all quantization indices costs are cached justifies
storing 20 more integers in a structure already allocated on heap.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-01 13:04:40 +00:00
Luca Barbato
f8c34f4b8d
indeo2: Fix banding artefacts
...
Rename luma table to delta table and change how it is used.
CC: libav-stable@libav.org
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-03-01 13:50:24 +01:00
Luca Barbato
d4066a7024
indeo2data: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-03-01 13:46:00 +01:00
Rostislav Pehlivanov
6061b78e83
vc2enc: remove redundant put_padding() and use skip_put_bytes() instead
...
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-03-01 11:39:30 +00:00
Clément Bœsch
090621d7ce
lavfi: add bench and abench filters
2016-03-01 10:36:15 +01:00
Diego Biurrun
1a094af638
fft: Split MDCT bits off from FFT
2016-03-01 10:18:28 +01:00
Mark Harris
4d13bcceb9
sdp: fix opus sprop-stereo fmtp syntax
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2016-03-01 08:56:36 +02:00
Andrew Shulgin
1c7e2cf9d3
avformat/rtpdec_h264: Ignore invalid sprop-parameter-sets missing PPS
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-03-01 02:19:23 +01:00
Ganesh Ajjanagadde
7dabc78ce1
lavu/rational: add more info regarding floor(x+0.5) usage
...
Add some more verbose info regarding why the imprecise and slow floor(x+0.5) hack
is used; helpful for future maintenance.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-02-29 19:26:55 -05:00
Michael Niedermayer
380fd32a8c
fate: add libavcodec utils test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 21:44:07 +01:00
Michael Niedermayer
0be09f54fb
avcodec: Add utils test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 21:44:06 +01:00
Derek Buitenhuis
9f9ed79d4c
hls: Add and use a memebr of AVIOInternal rather than abuse opaque
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 20:10:11 +00:00
James Almer
3acbb91d13
fate: fix fate-libavformat target
...
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-29 16:26:37 -03:00
Derek Buitenhuis
b9aa4ccff5
Merge commit 'cae448cfbf31d492cba782bc64fc4eed556ed83d'
...
* commit 'cae448cfbf31d492cba782bc64fc4eed556ed83d':
aviobuf: add a private data struct for avio_open()ed contexts
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 18:43:16 +00:00
Michael Niedermayer
4899c02c38
avformat/protocols: Fix ff_urlcontext_child_class_next()
...
This fixes -read_ahead_limit
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 19:34:52 +01:00
Michael Niedermayer
a6cd817a54
avformat/msf: Also check the codec tag in probing
...
Fixes probing failure
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 19:25:01 +01:00
Derek Buitenhuis
bb8cc89b29
Merge commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2'
...
* commit '832a202c47a246ed15e3edc6b05dfcfa7d82c4b2':
protocols: make the list of protocols static
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 18:08:15 +00:00
Derek Buitenhuis
95cdc0a5c6
avformat: Remove async from TESTPROGS
...
It is current disabled.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 17:14:56 +00:00
Derek Buitenhuis
53025fe187
Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'
...
* commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56':
lavf: move urlcontext_child_class_next() to protocols.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 17:00:44 +00:00
Derek Buitenhuis
8fd5342463
Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'
...
* commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6':
lavf: move avio_enum_protocols() to protocols.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 16:56:47 +00:00
Derek Buitenhuis
9c75148e6e
Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'
...
This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.
* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
lavf: reorganize URLProtocols
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 16:51:10 +00:00
Timothy Gu
e3461197b1
x86/vc1dsp: Split the file into MC and loopfilter
2016-02-29 08:46:53 -08:00
Derek Buitenhuis
f1e7c42f08
Merge commit '225e84e74544062706c0159ec0737b0e1d40915f'
...
* commit '225e84e74544062706c0159ec0737b0e1d40915f':
hls: disallow opening nested files in child demuxers
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:50:32 +00:00
Derek Buitenhuis
6a8d05cb4d
Merge commit 'e192cd9ce2b51c2e6919f2a78b1ce53e0024e728'
...
* commit 'e192cd9ce2b51c2e6919f2a78b1ce53e0024e728':
smoothstreamingenc: do not open the files as read+write
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:43:00 +00:00
Derek Buitenhuis
48847ee357
Merge commit 'd082078a88da3b3e926197d0d2aa9fa322123b76'
...
* commit 'd082078a88da3b3e926197d0d2aa9fa322123b76':
dashenc: eliminate ffurl_* usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:41:03 +00:00
Derek Buitenhuis
04747c5a73
Merge commit '7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a'
...
* commit '7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a':
lavf: use the io_open callbacks for files opened from open_input() as well
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:39:19 +00:00
Derek Buitenhuis
39fdffa736
Merge commit '5efd91284e56d444139ed811671c59a129bbb92f'
...
This commit is no-op. The affected piece of code does not
exist in FFmpeg.
* commit '5efd91284e56d444139ed811671c59a129bbb92f':
avprobe: do not call avio_close() on a custom context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:36:38 +00:00
Derek Buitenhuis
14a69ae60c
Merge commit 'dc6527ed908e4d330738f139074455ffbe56a2de'
...
FATE tests have been updated to patch. They do not differ in
any meaningful way.
* commit 'dc6527ed908e4d330738f139074455ffbe56a2de':
nutenc: do not use AVCodecContext.frame_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-29 15:29:43 +00:00
Carl Eugen Hoyos
8c5092912b
lavf: Add pcx auto-detection.
2016-02-29 15:49:52 +01:00
Carl Eugen Hoyos
4e05a12a41
lavc/pcxenc: Update format description link.
2016-02-29 12:42:29 +01:00
Carl Eugen Hoyos
c0ecc597fa
lavf/img2dec: Skip SOS when auto-detecting jpeg.
...
Improves jpeg auto-detection.
2016-02-29 11:58:16 +01:00
Clément Bœsch
98084adccf
build: add --install-name-dir=DIR Darwin option
...
This option is typically useful when cross-compiling dynamic libraries
for iOS, with something such as --install-name-dir=@rpath
2016-02-29 11:01:24 +01:00
Muhammad Faiz
d1401cb1d0
avfilter/avf_showcqt: optimize draw routines
...
optimize draw_bar_yuv (slightly faster)
optimize draw_axis (about 2x faster)
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-02-29 16:06:39 +07:00
Michael Niedermayer
080be982e9
fate/mpeg4: add mpeg4-es with codec timestamps (vlc ticket 7571)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 04:24:52 +01:00
Michael Niedermayer
4d338f9b64
fate/vp8: add test for Ticket2451
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 03:01:15 +01:00
Michael Niedermayer
77524ee2dc
avformat/utils: Be slightly more tolerant with fps vs. stream timebase
...
Fixes regression with ticket2451
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 02:59:15 +01:00
Michael Niedermayer
1b65910185
fate/gif: add Test for Ticket3052
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 01:41:11 +01:00
Michael Niedermayer
993d622d00
fate/filter-video: add test for Ticket1578
...
reference test sample is tiny
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 00:52:26 +01:00
Michael Niedermayer
a11258b732
tests/fate/lossless-video: Add test for ticket4119
...
The reference file is very small, and there was no previous test for the -vsync values
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-29 00:21:17 +01:00
Michael Niedermayer
3e42c1128f
avcodec/libzvbi-teletextdec: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 23:39:32 +01:00
Paul B Mahol
65cc3915db
avfilter/avf_showvolume: support unknown channel layouts too
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-28 23:18:31 +01:00
Michael Niedermayer
1492507208
ffmpeg_vdpau: Remove unused variable
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 23:16:33 +01:00
Marton Balint
e22bd239c0
avformat/mov: do not leak memory on ffio_read_size failure
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-28 23:00:45 +01:00
Marton Balint
4840effe42
avformat/mov: merge mov_read_custom functions
...
This also fixes reading gapless metadata when the entries do not start with the
mean atom. Such samples can be found here:
https://hydrogenaud.io/index.php/topic,93310.0.html
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-28 23:00:45 +01:00
Raymond Hilseth
c66a6369e4
avformat/dashenc: Enable dash output to work when the output isn't a local file
...
Use avpriv_io_move instead of ff_rename to support more than only
the file protocol.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 22:32:28 +01:00
Raymond Hilseth
20e4863ab1
avformat/file: enable file_move() without unistd.h
...
it only requires the rename function from os_support.h.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 22:26:39 +01:00
Rodger Combs
22dbc1caaf
lavf/mov: downgrade sidx errors to non-fatal warnings; fixes trac #5216
2016-02-28 15:00:34 -06:00
Rodger Combs
3617e69d50
lavf/mov: fix sidx with edit lists
2016-02-28 15:00:34 -06:00
Rostislav Pehlivanov
e7345abe05
vc2enc: redistribute leftover bytes
...
This commit redistributes the leftover bytes amongst the top 150 slices
in terms of size (in the hopes that they'll be the ones pretty bitrate
starved).
A more perceptual method would probably need to cut bits off from slices
which don't need much, but that'll be implemented later.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-28 19:06:29 +00:00
Rostislav Pehlivanov
bbcd5e99c3
vc2enc: allocate the DWT context with the current plane size
...
Previously used the luma size only.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-28 19:06:29 +00:00
Rostislav Pehlivanov
2f19583911
2enc: clip and warn when user bitrate set too low
...
The encoder crashed on verly low bitrates since there wasn't enough
space allocated.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-28 19:06:29 +00:00
Rostislav Pehlivanov
6e5c6d61bd
vc2enc: clip and warn when user bitrate set too low
...
The encoder crashed on verly low bitrates since there wasn't enough
space allocated.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-28 19:06:29 +00:00
Rostislav Pehlivanov
0a2adf0f47
vc2enc: carry over quantization index across frames as a starting point
...
Previously a global average was used. Using the previous quantizer
resulted in a fairly significant speedup as slice size selection settled
down quicker.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-28 19:06:29 +00:00
Rostislav Pehlivanov
fc1d3cbfdc
vc2enc: use 32 bits for quantized coefficients LUT
...
16 bits were definitely not enough and caused artifacts to appear on
images at barely compressed images.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-28 19:06:29 +00:00
Rostislav Pehlivanov
5cc53c2e53
vc2enc: cache bits per quantizer, calculate wasted bits
...
Needed for following commits, also a speed increase.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-28 19:06:29 +00:00
Paul B Mahol
2ad1c87bb2
avfilter/vf_vectorscope: add color5 mode, mode like color but with higher saturation
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-28 20:03:04 +01:00
Michael Niedermayer
c6f4720b86
avcodec/mjpegdec: Fix decoding slightly odd progressive jpeg
...
Fixes: ebd58db6-dc86-11e5-91c2-59daeddf50c7.jpg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 18:46:35 +01:00
Timothy Gu
bbf7500df9
LICENSE: Thorough editing
...
The changes in "Incompatible libraries" section are strictly based on
what our configure script says.
2016-02-28 08:19:44 -08:00
Timothy Gu
222e6da605
x86/vf_blend: Add SSE2 optimization for divide
...
4.5x faster than C float version with autovectorization
10 x faster than C int version
25 x faster than C float version without autovectorization
2016-02-28 08:19:09 -08:00
Derek Buitenhuis
1c9215e580
lavf/mp3: Properly check return values of seeks and reads while reading the header
...
Fixes large amounts of seeking past EOF, which could be extremely
slow over a network.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-28 13:57:35 +00:00
Roman Ryltsov
af2568a675
avformat/Makefile: Fixed missing rawutils.o reference (required by movenc.c)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 14:43:52 +01:00
Reimar Döffinger
4dd4d53531
Document and validate AVFrame plane pointers.
...
Check that the required plane pointers and only
those are set up.
Currently does not enforce anything for the palette
pointer of pseudopal formats as I am unsure about the
requirements.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-02-28 13:33:14 +01:00
Reimar Döffinger
45fa03b1f9
mjpegdec: Do not assume unused plane pointer are NULL.
...
We do neither document nor check such a requirement
and for application-provided get_buffer2 they could
contain the result of a malloc(0) or whatever value
they had previously.
This fixes a use-after-free in e.g. MPlayer:
https://trac.mplayerhq.hu/ticket/2262
We might want to consider changing the (documented)
API in addition though.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-02-28 13:32:01 +01:00
Reimar Döffinger
0f199f0ad0
mss2: Fix buffer overflow.
...
Reported as https://trac.mplayerhq.hu/ticket/2264 but have
not been able to reproduce with FFmpeg-only.
I have no idea what coded_height is used for here exactly,
so this might not be the best fix.
Fixes the following chain of events:
ff_mss12_decode_init sets coded_height while not setting height.
ff_mpv_decode_init then copies coded_height into MpegEncContext height.
This is then used by init_context_frame to allocate the data structures.
However the wmv9rects are validated/initialized based on avctx->height, not
avctx->coded_height.
Thus the decode_wmv9 function will try to decode a larger video that we
allocated data structures for, causing out-of-bounds writes.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
2016-02-28 13:32:01 +01:00
Michael Niedermayer
5d18dc3795
tests/lavf-regression: Add mp4 timecode test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 03:54:50 +01:00
Syed Andaleeb Roomy
b4dcd351ec
movenc: Timecode in MP4 Although MP4 does not have a concrete specification to store timecode information, the following technical note from Apple describes a way to achieve this via timecode track, similar to how it is done for MOV files.
...
https://developer.apple.com/library/mac/technotes/tn2174/_index.html
- Enabled creation of timecode tracks for MP4 in the same way as MOV.
- Used nmhd as media information header of timecode track of MP4 instead
of gmhd used in MOV, thus avoiding tcmi also, as recommended above.
- Bypassed adding source reference field for MP4, as suggested above.
Issue: https://trac.ffmpeg.org/ticket/4704
Signed-off-by: Syed Andaleeb Roomy <andaleebcse@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 03:47:23 +01:00
Andreas Cadhalpun
15708f1347
configure: add direct detection of libopencv
...
The pkg-config file contains all opencv libraries, not only the
neccessary ones.
This change makes it possible to use the libopencv-imgproc-dev Debian
package instead of libopencv-dev, saving about 200 MB of useless
build-dependencies.
In particular one doesn't need to install the parts of opencv that
depend on ffmpeg libraries.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 02:47:12 +01:00
Michael Niedermayer
b70e9b4906
avutil/imgutils: Assert that the 2nd av_image_fill_linesizes() call in av_image_fill_linesizes() still succeeds
...
Fixes CID1271742
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-28 02:02:50 +01:00
Rodger Combs
f0ea536c47
lavc/aac_ac3_parser: reindent
2016-02-27 16:31:46 -06:00
Rodger Combs
9f5baf9085
lavc/aac_ac3_parser: avoid zeroing codec parameters if we haven't read a frame
...
This caused issues when seeking in some unusual MPEGTS files
2016-02-27 16:31:46 -06:00
Rodger Combs
a21a3c25dc
probe TrueHD in MPEGTS
2016-02-27 16:27:27 -06:00
Rodger Combs
b426d66370
lavc/Makefile: dnxhd demuxer depends on dnxhddata.o
2016-02-27 16:26:18 -06:00
wm4
5d2c5e8bff
vf_copy: exclude hwaccel formats
...
This does obviously not work.
(Additions based on vf_crop.c.)
2016-02-27 21:35:20 +01:00
Paul B Mahol
e266d29978
avfilter/avf_showwolume: add orientation and step option
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-27 17:45:20 +01:00
Clément Bœsch
653af9f188
lavfi/ass: fix version check for sub_text_format option
2016-02-27 16:26:10 +01:00
Kieran Kunhya
8adbe26b90
avcodec/cfhd: Add support for 12-bit RGBA.
...
Plays all known samples
2016-02-27 13:17:20 +00:00
Kieran Kunhya
0096453f70
cfhd: reallocate internal buffers on format change.
...
Fixes some, but not all, of the threading fuzz crashes
2016-02-27 12:18:06 +00:00
Michael Niedermayer
d39b770aa2
avcodec/utils: Check that the video data[] arrays are NULL on the input to get_buffer_internal()
...
This should return an error to the decoder if the struct it tried to getbuffer is dirty
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 13:11:52 +01:00
Michael Niedermayer
bdf7093bd0
avcodec/utils: Check all data[] pointers in video_get_buffer() not just the first
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 13:11:52 +01:00
Clément Bœsch
1e7a37f0a0
sws/yuv2rgb: clarify precision of coeff and offset for mmx code
...
It makes easier looking at the difference with the generic code just
below.
2016-02-27 11:13:26 +01:00
Clément Bœsch
f9987464cf
sws/yuv2rgb: avoid a few ub on signed left shifts
2016-02-27 11:13:26 +01:00
Vicente Olivert Riera
5156578d1f
mips: do not disable any feature for generic cores
...
We don't know which features are available when the user selects a
generic core, so don't disable anything by default and let the user
decide.
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 04:22:56 +01:00
Vicente Olivert Riera
8514fb6b98
mips: improve detection of ISAs, FPU and ASEs (DSP, MSA)
...
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 04:22:55 +01:00
Mats Peterson
6aac43f180
lavf/matroskadec: Process QuickTime palette per track
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 02:03:02 +01:00
Mats Peterson
9a27780821
lavf/movenc: Add palette to video sample description
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-27 01:28:48 +01:00
Diego Biurrun
f6ccee9bed
fate: fft: Split DCT/FFT/MDCT/RDFT tests into separate targets
2016-02-26 22:44:30 +01:00
Paul B Mahol
42c5e1cc2a
avfilter: add datascope filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-26 22:22:05 +01:00
Clément Bœsch
b5451d88cf
lavc: reindent a few decoders after previous commits
2016-02-26 22:15:20 +01:00
Clément Bœsch
22ebbda637
lavc: deprecate decoded ass subtitles with timings
2016-02-26 21:53:34 +01:00
Clément Bœsch
fa2df3a401
lavfi/ass: use ass_process_chunk() instead of ass_process_data()
2016-02-26 21:53:34 +01:00
Clément Bœsch
6433618dc0
ffmpeg: set sub_text_format to ass (without timing) by default
...
Fixes Ticket #4783
2016-02-26 21:53:34 +01:00
Clément Bœsch
30e7685360
lavc/options: add ass_ro_flush_noop to flags2
2016-02-26 21:53:32 +01:00
Clément Bœsch
2941282124
lavc: allow subtitle text format to be ASS without timing
2016-02-26 21:49:34 +01:00
Clément Bœsch
805685fffd
Kill timed SSA
2016-02-26 21:34:33 +01:00
Michael Niedermayer
7a8ab57cf1
fate: Add test for packed mp3 in mp4 demuxing
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-26 20:12:53 +01:00
Michael Niedermayer
410f717ff6
avcodec/utils: Merge identical if conditions
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-26 20:12:30 +01:00
Rostislav Pehlivanov
bc7beb6574
vc2enc: calculate the minimum slice size only once
...
This commit moves the minimum bits per slice calculations outside of the
rate control function as it is identical for every slice.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-26 15:38:26 +00:00
Rostislav Pehlivanov
2b811e4605
vc2enc: halve allocated table size, refactor and optimize quantization
...
Since coefficients differ only in the last bit when writing to the
bitstream it was possible to remove the sign from the tables, thus
halving them. Also now all quantization is done in the unsigned domain
as the sign is completely separate, which gets rid of the need to do
quantization on 32 bit signed integers.
Overall, this slightly speeds up the encoder depending on the machine.
The commit still generates bit-identical files as before the commit.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-26 14:47:06 +00:00
Diego Biurrun
4c297249ac
rdft: arm: Split RDFT initialization into a separate file
2016-02-26 14:34:58 +01:00
Diego Biurrun
97aec6e75e
fft: arm: Drop unnecessary #include, add missing ones
2016-02-26 14:34:58 +01:00
Diego Biurrun
73ff983e8d
fft: x86: cosmetics: Drop silly comments, add comment, whitespace
2016-02-26 14:34:58 +01:00
Rostislav Pehlivanov
7db2e757c5
vc2enc: use FFABS() instead of abs()
...
Provides a minor speedup.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-26 12:55:34 +00:00
Rostislav Pehlivanov
3ef10406e1
vc2enc: correctly zero out coefficient array padding
...
Credit for figuring this out goes to James Darnley.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-26 12:21:36 +00:00
Rostislav Pehlivanov
35346c7b0f
vc2enc: mark as FF_CODEC_CAP_INIT_THREADSAFE and align AVCodec entries
...
The encoder does not modify any global variables.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-26 12:17:42 +00:00
Paul B Mahol
2a7f056d88
avfilter/af_astats: do not clear previous sample value
...
Should help when using reset=1 and metadata=1
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-26 11:12:45 +01:00
Luca Barbato
ce9d7da765
qsv: Move down the implementation query
...
The plugin loaded may not match the general implementation capability
wise.
2016-02-26 10:28:42 +01:00
Stefano Sabatini
dedcb3c5a5
lavf/mux: do not fail in case of non strictly monotonically increasing DTS values for data packets
...
Consistent with what we already do with subtitles since ac08c5c0ad .
2016-02-26 10:18:09 +01:00
Carl Eugen Hoyos
07eec5e721
lavf/img2dec: Skip SOF size when probing jpeg.
...
Fixes auto-detection for some resolutions.
Reported-by: Clément Bœsch
2016-02-26 09:53:29 +01:00
Matthieu Bouron
885a6d8324
configure: only check dispatch header on darwin
...
Fixes build of lavd/jack on linux if dispatch happens to be available on
this platform. dispatch, as well as its dependencies kqueue and pwq are
generally not installed / distribued on linux systems. If it happens to
be the case, you want to explicitely link against the libraries (using
-ldispatch) as opposed to darwin where it is part of the standard
library and -ldispatch doesn't work.
2016-02-26 09:23:17 +01:00
Anton Khirnov
dbb43b8b83
avpacket: properly reset data/size in av_packet_move_ref()
...
It currently just calls av_init_packet(), which does not touch those
fields.
2016-02-26 09:15:36 +01:00
Anton Khirnov
ba357e9869
avprobe: switch to codecpar
2016-02-26 09:15:29 +01:00
Anton Khirnov
567d6d5f9d
avprobe: add local per-stream state
...
This will be useful in the following commits.
2016-02-26 09:15:20 +01:00
Anton Khirnov
c9478410c6
avprobe: add local per-file state
...
Do not pass just a bare AVFormatContext pointer around, wrap it in
struct. This will be useful in the following commits.
2016-02-26 09:15:06 +01:00
Anton Khirnov
c80344d010
mpegvideo_enc: use avcodec_free_context() instead of av_free()
2016-02-26 09:14:59 +01:00
Anton Khirnov
168a443d43
avprobe: print information from the codec descriptor
...
avprobe is not doing any decoding, so this is more correct than printing
information from a random codec implementation.
2016-02-26 09:14:49 +01:00
Anton Khirnov
e7188a1a84
avprobe: remove a pointless condition and a dead branch
...
AVStream.codec is always non-NULL
2016-02-26 09:14:38 +01:00
Anton Khirnov
dc4983d78a
APIchanges: add missing hashes and dates
...
Also, remove a stray line (apparently fallout from conflict resolution).
2016-02-26 09:14:13 +01:00
Anton Khirnov
3e8fd93b6a
lavf: add a missing bump and APIchanges for the codecpar switch
2016-02-26 09:14:13 +01:00
Lou Logan
0eb0f29a40
MAINTAINERS: remove myself as a server maintainer
...
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-02-25 18:10:48 -09:00
Vittorio Giovara
e66fa35392
vc1dec: Check group allocations separatedly
...
This avoids accessing NULL pointers in case of error.
2016-02-25 15:21:42 -05:00
Matthieu Bouron
666e2edc41
configure: add missing --strip option to show_help()
2016-02-25 21:21:39 +01:00
Vittorio Giovara
01f0e6a0c9
vc1dec: Fix leak on error for array allocations
...
The deinit function in the 'error' section will correctly free
everything.
2016-02-25 15:20:53 -05:00
Vittorio Giovara
f91d94bdfc
vc1dec: Properly call deinit function on error
2016-02-25 15:20:24 -05:00
Vittorio Giovara
35b1cd343c
vc1dec: Drop commented out cruft
2016-02-25 15:19:36 -05:00
Carl Eugen Hoyos
0f31d401c3
lavc/mjpegdec: Fix decoding images with Adobe_CM tag.
...
Fixes ticket #5267 .
2016-02-25 13:26:13 +01:00
Carl Eugen Hoyos
03af008e21
doc/filters: Fix idet option name "rep_thres".
...
Reported by forum user vovcheck.
2016-02-25 13:23:52 +01:00
Matt Oliver
7ecef5ed51
avfilter/hwupload_cuda: Add missing semicolon.
...
Signed-off-by: Matt Oliver <protogonoi@gmail.com >
2016-02-25 15:52:01 +11:00
Neil Birkbeck
ad17b9d2d4
libavcodec:add packet level support for mastering metadata
...
Some containers, like webm/mkv, will contain this mastering metadata.
This is analogous to the way 3D fpa data is handled (in frame and
packet side data).
Signed-off-by: Neil Birkbeck <neil.birkbeck@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-25 00:18:12 +01:00
Michael Niedermayer
954f865c8e
avfilter/drawutils: fix gray and gbr formats on big endian
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-25 00:07:51 +01:00
Michael Niedermayer
6bc20e84d8
avfilter/drawutils: Fix ff_fill_rectangle() on big endian
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-25 00:07:51 +01:00
Paul B Mahol
0d65a7d033
avfilter/af_astats: clear all stats
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-25 00:00:25 +01:00
Paul B Mahol
c09248aecd
avfilter/af_astats: reset stats prior not after filtering
...
This way stats printed at uninit are also useful.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-24 22:32:26 +01:00
Michael Niedermayer
5870f2a1dc
Revert "Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'"
...
This broke packed_maindata.mp3.mp4
Its unknown to me what this commit would have fixed
Reviewed-by: James Almer <jamrial@gmail.com >
This reverts commit 79127dbbef , reversing
changes made to 9fad1ce7c9 .
2016-02-24 21:24:38 +01:00
Vittorio Giovara
fa55addd23
img2: Drop av_ prefix for a static function
...
This prefix is reserved for public functions only.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-02-24 13:56:46 -05:00
James Almer
fc404460bd
configure: add missing vc1dsp dependency to vc1_decoder
...
Fixes compilation of vc1_decoder when vc1_parser is not enabled
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-24 15:49:51 -03:00
Paul B Mahol
b6a0aa1c0a
avfilter/vf_blend: add freeze and heat modes
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-24 19:30:13 +01:00
Derek Buitenhuis
2ef37691a0
Merge commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49'
...
This commit is a no-op. We already do this.
* commit 'bf7be043fcfda29c81ef2268885b4ccc643e7c49':
matroska: Always consider S_TEXT/UTF8 as SRT when demuxing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:27:32 +00:00
Derek Buitenhuis
8ae21fd959
Merge commit '8caadfc53ddc55a269722ada65294f0ea8b609ac'
...
* commit '8caadfc53ddc55a269722ada65294f0ea8b609ac':
fate: Be silent when switching to Git branch
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:25:27 +00:00
Derek Buitenhuis
79b1a24b7d
Merge commit '8d918a98aa24134a043d578ef45bae363dbed9db'
...
* commit '8d918a98aa24134a043d578ef45bae363dbed9db':
rtpdec: Use the right logging context
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:24:34 +00:00
Derek Buitenhuis
ef7ce480c8
Merge commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9'
...
* commit 'd24bd96bdd5b4bae9a9e0055fa8d1104db1283a9':
build: Disentangle VC-1 decoder and parser
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:23:36 +00:00
Derek Buitenhuis
b056482ef3
Merge commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c'
...
* commit '15a24614aef5836af3cd2c7cc3b2b737eee6bf3c':
build: Add vc1dsp component for more fine-grained dependencies
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:21:38 +00:00
Derek Buitenhuis
2814f06abf
Merge commit 'f9fbd474676e903e12efe83203697d60a9d28cf9'
...
* commit 'f9fbd474676e903e12efe83203697d60a9d28cf9':
msmpeg4data: Move WMV2 data tables to their own file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:15:14 +00:00
Derek Buitenhuis
133aa68601
Merge commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4'
...
* commit '79866803ffc4c1a1b02663de9bab216b8cfdb8b4':
msmpeg4data: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:13:25 +00:00
Derek Buitenhuis
d61849f0b7
Merge commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac'
...
* commit 'b10c33c5ea9a41c41726fb5488ea1633e3f898ac':
build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:12:26 +00:00
Derek Buitenhuis
0ffaae60e8
Merge commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba'
...
* commit '7d16d8533daf73b66d318c5e27de3b17208aa0ba':
build: More precise dependencies for h264dsp
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:11:03 +00:00
Derek Buitenhuis
dc61014319
Merge commit 'f273f7fb25b68792be481c9241b0ec2876e41f35'
...
This commit is a no-op. We already set this.
* commit 'f273f7fb25b68792be481c9241b0ec2876e41f35':
mkv: Force the full parsing of mp3
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:08:45 +00:00
Derek Buitenhuis
79127dbbef
Merge commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0'
...
* commit '3ef98937f512184f80d3bd30015f5ec83dc11eb0':
mov: Force the full parsing of mp3
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:06:40 +00:00
Derek Buitenhuis
9fad1ce7c9
Merge commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c'
...
This commit is a no-op.
We have already reverted the configure changes, and we do not have a typo
in configure.
* commit 'b4a0f172c7f116d8d329ff02f29c138a9291fd3c':
Revert all recent configure changes related to dependency resolution
build: Fix typo in HEVC VDPAU hwaccel dependencies
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:05:29 +00:00
Derek Buitenhuis
f99195d56f
Merge commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364'
...
* commit '0d1229f1d2b8f26dd50c6be7917bb8ed8cb95364':
voc: Split ff_voc_get_packet into a separate file
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 18:04:34 +00:00
Derek Buitenhuis
745d0c0300
Merge commit '624e235502c5aa2d17e22dd6c0ccdf080a177310'
...
* commit '624e235502c5aa2d17e22dd6c0ccdf080a177310':
build: Introduce iso_media component
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:53:30 +00:00
Derek Buitenhuis
34e4c588c8
Merge commit '82454c3a826bc8aa42474097784b70befd5be532'
...
* commit '82454c3a826bc8aa42474097784b70befd5be532':
build: Let the WTV demuxer select the MPEG-TS demuxer
build: Adjust mpeg4video parser dependencies
build: Fix mpegvideo component dependencies
build: Fix dependencies for components relying on H.263 data tables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:46:10 +00:00
Derek Buitenhuis
3c5a040ad9
Merge commit 'e453129321778886813dcecf73c8b42f8352ca0e'
...
* commit 'e453129321778886813dcecf73c8b42f8352ca0e':
build: Add missing dependencies for eatqi decoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:39:04 +00:00
Derek Buitenhuis
7e12a3d57c
Merge commit '71eaefa64a54bece571299ca600d06f48ac7c6c3'
...
* commit '71eaefa64a54bece571299ca600d06f48ac7c6c3':
build: Add missing celp_math dependency for G723_1 encoder and decoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:38:33 +00:00
Derek Buitenhuis
ca408cf557
Merge commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f'
...
* commit '7c82d31cbe9fc5d5a321ad49c14a472bd629b50f':
checkasm: Use standard multiple inclusion guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:36:52 +00:00
Derek Buitenhuis
aaa3d62272
Merge commit '3d8025d602045cbd2894e5182d9243c2e864c8c8'
...
* commit '3d8025d602045cbd2894e5182d9243c2e864c8c8':
profiles: Add missing #endif comment
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:36:30 +00:00
Derek Buitenhuis
5eb4073781
Merge commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab'
...
* commit '6b96d2dcdaa60d7919d710432c6ca204b7fab0ab':
cosmetics: Drop particularly redundant silly comments
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:35:47 +00:00
Derek Buitenhuis
1a12eb4a73
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'
...
* commit '29c2d06d67724e994980045afa055c6c34611b30':
cosmetics: Drop empty comment lines
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:31:44 +00:00
Derek Buitenhuis
cb0355537d
Merge commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c'
...
* commit 'd847a40888c064cc8c35b546fc5a0ccb69136a7c':
hwcontext_cuda/vdpau: add to skipheaders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:24:04 +00:00
Derek Buitenhuis
0d4c0240af
Merge commit '9c0bc1e980a99106d6749ec632f166b87275871e'
...
* commit '9c0bc1e980a99106d6749ec632f166b87275871e':
qsv: add a missing #include
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:22:43 +00:00
Derek Buitenhuis
f6d633d726
Merge commit 'b92962436bdcfae478c8598dca397a397762eef8'
...
* commit 'b92962436bdcfae478c8598dca397a397762eef8':
mov: Fix the format specifier type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:21:17 +00:00
Derek Buitenhuis
33215d3c48
Merge commit '2edc718723b60530aead26c20cbc891102f7d529'
...
This is a no-op. This was a part of the already-reverted
broken configure saga.
* commit '2edc718723b60530aead26c20cbc891102f7d529':
configure: Relax the implication of --enable for components
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:18:54 +00:00
Derek Buitenhuis
2cfb34a4e8
Merge commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c'
...
* commit '47570dbde8b33001d5ccac44e7ebaaeecbcb807c':
fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:18:27 +00:00
Derek Buitenhuis
259fef86bb
Merge commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1'
...
* commit 'c15f6098b1b25689dd5e86aeb5ce69bc12efe1e1':
avconv: pass the hw context from filters to the encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:08:13 +00:00
Derek Buitenhuis
e05704bd46
Merge commit '871d0930d4c8666df5514093beff874acbe5cce0'
...
Timo is going to implement this for us.
* commit '871d0930d4c8666df5514093beff874acbe5cce0':
nvenc: support CUDA frames as input
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:05:58 +00:00
Derek Buitenhuis
7e49cdd129
Merge commit '7b3214d0050613bd347a2e41c9f78ffb766da25e'
...
* commit '7b3214d0050613bd347a2e41c9f78ffb766da25e':
lavc: add a field for passing AVHWFramesContext to encoders
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:05:11 +00:00
Derek Buitenhuis
ef9915a0e2
Merge commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8'
...
* commit '21f7cd4acd8dc4b4796b55966dd015cb037164d8':
lavfi: add a filter for uploading normal frames to CUDA
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 17:02:48 +00:00
Derek Buitenhuis
14f942b359
Merge commit '1bf34134612e509fa68c70dfff418c6022459259'
...
This commit is a no-op.
* commit '1bf34134612e509fa68c70dfff418c6022459259':
avconv: use the new buffersrc parameters API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 16:39:20 +00:00
Derek Buitenhuis
10424024a1
Merge commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3'
...
* commit 'b3dd30db0b2d857147fc0e1461a00bd6172a26a3':
lavfi: pass the hw frames context through the filter chain
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 16:03:57 +00:00
Derek Buitenhuis
6992276aca
Merge commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073'
...
* commit 'ad884d100259e55cb51a4239cd8a4fd5154c2073':
hwcontext: add a CUDA implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 15:23:16 +00:00
Derek Buitenhuis
63c3e35332
Merge commit '7bc780cd4413f688d3b834037b0f9ddfd6948140'
...
* commit '7bc780cd4413f688d3b834037b0f9ddfd6948140':
pixfmt: add a CUDA hwaccelled format
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 15:11:06 +00:00
Anton Khirnov
9f2c1c77d2
configure: Allow linking to CUDA dynamically instead of dlopen()ing it at runtime
...
This currently doesn't do anything, but will be used later for hwaccel
filters and libavutil.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 15:05:13 +00:00
Justin Ruggles
e1c15a9475
img2dec: Support Progressive JPEG in jpeg_probe
...
There can be multiple SOS markers, so do not return 0 in that case.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 14:51:12 +00:00
Derek Buitenhuis
1f32d01de2
Merge commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de'
...
This commit is a no-op. We already have such functionality.
* commit 'c51b2c79a7ba084253e892c56dd49ee97115c7de':
Allow linking to CUDA dynamically instead of dlopen()ing it at runtime
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-24 14:28:20 +00:00
Diego Biurrun
d6e49096c0
idct: Only build prores IDCT if ProRes decoder is enabled
2016-02-24 11:41:01 +01:00
Anton Khirnov
3c53627ac1
qsvdec: store the sync point in heap memory
...
The reasoning is the same as for the corresponding qsvenc patch.
2016-02-24 10:41:45 +01:00
Maxym Dmytrychenko
a1335149fd
qsvenc: store the sync point in heap memory
...
The QSV runtime expects the sync point address passed to
MFXVideoENCODE_EncodeFrameAsync() to be valid until
MFXVideoCORE_SyncOperation().
Signed-off-by: Anton Khirnov <anton@khirnov.net >
2016-02-24 10:14:40 +01:00
Anton Khirnov
1138eb5509
vsrc_movie: convert to codecpar
2016-02-24 10:08:37 +01:00
Anton Khirnov
ac6d53589f
examples/transcode_aac: convert to codecpar
2016-02-24 10:08:34 +01:00
Anton Khirnov
a9e1f2cc61
examples/qsvdec: convert to codecpar
2016-02-24 10:08:30 +01:00
Anton Khirnov
9897d9f4e0
examples/output: convert to codecpar
2016-02-24 10:08:24 +01:00
Anton Khirnov
c23152a903
avplay: convert do codecpar
2016-02-24 10:05:43 +01:00
Anton Khirnov
0705f5960c
avplay: do not use AVStream.codec for decoding
...
AVStream.codec is now deprecated. Allocate a separate codec context
instead.
2016-02-24 10:05:31 +01:00
Michael Niedermayer
10fa50c156
avcodec/mpeg12dec: Fix missing slice handling without padding
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-24 03:22:31 +01:00
Kieran Kunhya
4170a44bbc
Add GBRAP12 pixel format
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-24 03:22:31 +01:00
Ganesh Ajjanagadde
e86444b19d
lavc/utvideodec: prevent possible signed overflow
...
Doing slice_end - slice_start is unsafe and can lead to undefined behavior
until slice_end has been properly sanitized.
Reviewed-by: Ronald S. Bultje <rsbultje@gmail.com >
Signed-off-by: Ganesh Ajjanagadde <gajjanag@gmail.com >
2016-02-23 20:37:11 -05:00
Michael Niedermayer
67e5bd0c50
swscale/utils: Fix chrSrcHSubSample for GBRAP16
...
Fixes part of Ticket5264
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-24 00:02:44 +01:00
Michael Niedermayer
df36257a53
swscale/input: Fix GBRAP16 input
...
Fixes part of Ticket5264
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-24 00:02:44 +01:00
Stefano Sabatini
14f7a3d55a
lavc/lavf: transmit stream_id information for mpegts KLV data packets
...
This allows to copy information related to the stream ID from the demuxer
to the muxer, thus allowing for example to retain information related to
synchronous and asynchronous KLV data packets. This information is used
in the muxer when remuxing to distinguish the two kind of packets (if the
information is lacking, data packets are considered synchronous).
The fate reference changes are due to the use of
av_packet_merge_side_data(), which increases the size of the output
packet size, since side data is merged into the packet data.
2016-02-23 18:44:12 +01:00
Mats Peterson
3ba57bfe8d
lavf/riffenc: Handle AV_PIX_FMT_MONOBLACK
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-23 17:58:52 +01:00
Anton Khirnov
15e84ed3f1
avconv: convert to codecpar
...
The switch is not yet complete because the parsers and the bistream
filters do not have a new AVCodecParam-based API yet.
2016-02-23 17:01:58 +01:00
Anton Khirnov
5b9cdf8cba
avconv: switch opening decoders and encoders
...
Open decoders first, next encoders. This makes sure that that
subtitle_header is always set properly, without relying on
avformat_find_stream_info() setting it.
2016-02-23 17:01:58 +01:00
Anton Khirnov
9200514ad8
lavf: replace AVStream.codec with AVStream.codecpar
...
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2016-02-23 17:01:58 +01:00
Anton Khirnov
a8068346e4
lavc: add a variant of av_get_audio_frame_duration working with AVCodecParameters
2016-02-23 17:01:58 +01:00
Anton Khirnov
998e1b8f52
lavc: add codec parameters API
...
This API is intended to allow passing around codec parameters without
using full AVCodecContext (which also contains codec options and
encoder/decoder state).
2016-02-23 17:01:58 +01:00
Muhammad Faiz
6eb4021d47
avfilter/avf_showcqt: use lrint
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-02-23 22:14:08 +07:00
Carl Eugen Hoyos
2aa21eec1a
postproc: fix unaligned access
...
Based on 59074310 by Andreas Cadhalpun.
Fixes ticket #5259 .
2016-02-23 15:50:28 +01:00
Diego Biurrun
257b30af8e
x86: hevc: Fix linking with both yasm and optimizations disabled
...
Some optimized functions reference optimized symbols, so the functions
must be explicitly disabled when those symbols are unavailable.
2016-02-23 11:47:54 +01:00
Diego Biurrun
cd846b4797
fate: Ignore errors from concatenating report files
...
Some files may be missing for valid reasons, e.g. on compile failure.
2016-02-23 11:45:37 +01:00
Diego Biurrun
9328adcc80
fate: Be silent when fetching Git updates
2016-02-23 11:45:37 +01:00
James Zern
7586b3adf2
libvpxenc: quiet unused-variable warning
...
with older versions of libvpx
since:
432be63 lavc/libvpx: Fix support for RGB colorspace.
Reviewed-by: James Almer <jamrial@gmail.com >
Signed-off-by: James Zern <jzern@google.com >
2016-02-22 20:23:31 -08:00
James Almer
45d3af9059
x86/dcadec: add ff_lfe_fir1_float_{sse3,avx}
...
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-22 21:21:34 -03:00
Marton Balint
5e555f9300
mpeg12enc: always write closed gops for intra only outputs
...
Reviewed-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-22 19:08:56 -05:00
Michael Niedermayer
f435d081b0
h264: Add an AVClass pointer to H264Context
...
Sample-Id: asan_heap-uaf_3660f67_757_cov_1257014655_Hi422FR1_SONY_A.jsv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-02-22 19:08:56 -05:00
Vittorio Giovara
0837d1dfe2
libx264: Fix noise_reduction option assignment
...
First check the context, then check internal option. Drop the ! typo.
Introduced in 60f0fde309 .
2016-02-22 19:06:48 -05:00
Carl Eugen Hoyos
37afeabd1b
lavfi/nnedi: Fix a compilation warning.
...
Silences the following warning:
libavfilter/vf_nnedi.c:611:15: warning: assignment discards ‘const’ qualifier from pointer target type
2016-02-23 00:21:49 +01:00
Carl Eugen Hoyos
44cf5b41d3
lavfi/nnedi: Fix a memleak.
2016-02-23 00:19:11 +01:00
Muhammad Faiz
76377d66b7
avfilter/avf_showcqt: remove unneeded headers
2016-02-23 01:05:08 +07:00
Muhammad Faiz
bfc61b0fcc
avfilter: add firequalizer filter
...
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com >
2016-02-23 00:44:07 +07:00
Rostislav Pehlivanov
1387f3a051
vc2enc: set quantization ceiling to 50
...
The reference encoder limits it to 64, but testing revealed that there
is absolutely no difference for indices above 50 in amount of zeroed
coefficients.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-22 17:25:13 +00:00
Paul B Mahol
5d93437e46
avfilter/vf_waveform: add 12bit depth support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-22 18:04:04 +01:00
James Almer
26034929d5
checkasm: bench each vf_blend mode once
...
Also bench a smaller buffer. This drastically reduces --bench runtime
and reports smaller, more readable numbers.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-22 13:54:07 -03:00
Xiaolei Yu
5a91589476
swscale/arm: re-enable neon rgbx to nv12 routines
...
Commit '842b8f4ba2e79b9c004a67f6fdb3d5c5d05805d3' fixed clang/iphone
build but failed on some versions of cygwin. It has now been verified
to work on both platforms.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-22 17:29:58 +01:00
Anton Khirnov
ec4c483976
lavf: add a protocol whitelist/blacklist for file opened internally
...
Should make the default behaviour safer for careless callers that open
random untrusted files.
Bug-Id: CVE-2016-1897
Bug-Id: CVE-2016-1898
2016-02-22 11:48:30 +01:00
Anton Khirnov
8c0ceafb0f
urlprotocol: receive a list of protocols from the caller
...
This way, the decisions about which protocols are available for use in
any given situations can be delegated to the caller.
2016-02-22 11:45:31 +01:00
Anton Khirnov
cae448cfbf
aviobuf: add a private data struct for avio_open()ed contexts
...
It will be useful in the following commits.
2016-02-22 11:36:47 +01:00
Anton Khirnov
832a202c47
protocols: make the list of protocols static
...
Disallow other code to touch it directly, now it's only accessible
through a blacklisting/whitelisting function.
2016-02-22 11:35:57 +01:00
Anton Khirnov
7d61dc95d7
lavf: move urlcontext_child_class_next() to protocols.c
...
It needs to access the list of protocols directly, so it more properly
belongs there.
2016-02-22 11:35:52 +01:00
Anton Khirnov
0fa00d0591
lavf: move avio_enum_protocols() to protocols.c
...
It's a more appropriate place for it.
2016-02-22 11:35:46 +01:00
Anton Khirnov
2758cdedfb
lavf: reorganize URLProtocols
...
Instead of a linked list constructed at av_register_all(), store them
in a constant array of pointers.
Since no registration is necessary now, this removes some global state
from lavf. This will also allow the urlprotocol layer caller to limit
the available protocols in a simple and flexible way in the following
commits.
2016-02-22 11:30:58 +01:00
Anton Khirnov
225e84e745
hls: disallow opening nested files in child demuxers
2016-02-22 11:30:33 +01:00
Anton Khirnov
e192cd9ce2
smoothstreamingenc: do not open the files as read+write
...
They are only written to, never read.
2016-02-22 11:30:24 +01:00
Anton Khirnov
d082078a88
dashenc: eliminate ffurl_* usage
...
Now all IO should go through the IO callbacks and be interceptable by
the caller.
2016-02-22 11:29:00 +01:00
Anton Khirnov
7fbb3b5b98
lavf: use the io_open callbacks for files opened from open_input() as well
...
There is no real reason to treat them differently.
2016-02-22 11:28:35 +01:00
Anton Khirnov
5efd91284e
avprobe: do not call avio_close() on a custom context
...
avio_close() can only be called on AVIOContexts created by avio_open(2).
2016-02-22 11:28:26 +01:00
Anton Khirnov
dc6527ed90
nutenc: do not use AVCodecContext.frame_size
...
It will in general not be available. Use block_align if known or fall
back to av_get_audio_frame_duration().
2016-02-22 11:28:00 +01:00
Luca Barbato
bf7be043fc
matroska: Always consider S_TEXT/UTF8 as SRT when demuxing
...
Reported-By: Maxim Koitsov <maksbotan@gentoo.org >
2016-02-22 09:40:16 +01:00
Michael Niedermayer
1ec7a70380
avutil/pixdesc: Make get_color_type() aware of CIE XYZ formats
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-22 03:49:43 +01:00
Josh de Kock
67f8a0be54
configure&avdevice/jack: Fixed issue #43 JACK indev support on OSX
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-22 00:46:49 +01:00
Mats Peterson
cf85a20d92
lavc/rawdec: Align AV_PIX_FMT_RGB24 correctly
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-22 00:44:42 +01:00
Marton Balint
3a4232a1a0
avformat/asfenc: write group_mutual_exclusion_objects for audio on multiple languages
...
Improves streaming compatibility with Windows Media Services. Also tested for
compatilbility in Windows Media Player, Windows Media ASF Viewer and VLC.
This version of the patch only writes exclusion among audio streams, therefore
choosing a subtitle language should be possible independently of audio language.
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-21 23:24:09 +01:00
Zalewa
2ac5a1a28e
ffserver: NoVideo and NoAudio flags weren't cleared between streams.
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 22:29:15 +01:00
Paul B Mahol
2b5b001182
doc/filters: fix nnedi typos
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-21 21:34:32 +01:00
Michael Niedermayer
0028da36cd
avformat/mpjpegdec: add AVFMT_NOTIMESTAMPS
...
there are no timestamps being set, thus do not attempt to collect any
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 20:07:50 +01:00
Alex Agranovsky
6dc1d5f87c
lavf/mpjpeg: probe should not depend on Content-Length MIME header being present
...
Signed-off-by: Alex Agranovsky <alex@sighthound.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 20:07:50 +01:00
James Almer
778439b69a
avcodec/webp: move exif_metadata outside of WebPContext
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-21 14:31:19 -03:00
Rostislav Pehlivanov
dc0481f2fb
vc2enc: use LAVC_INDENT instead of FFMPEG_VERSION for encoder comment
...
Prevents from having to recompile vc2enc on every single commit.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-21 16:39:54 +00:00
Michael Niedermayer
0910488a16
avformat/riffenc: Also check codec tag before setting raw_pal_avi
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 13:08:21 +01:00
Oliver Collyer
a2f8beef2d
ffserver&ffm: Fixed issues preventing ffserver write_index and files_size from being set correctly which was breaking ffserver streaming.
...
I discovered that ffserver streaming was broken (it seems like it has been since 20th November) and I opened a ticket for this (https://trac.ffmpeg.org/ticket/5250 <https://trac.ffmpeg.org/ticket/5250 >).
I spent yesterday learning git bisect (with the kind help of cehoyos) to painstakingly track down the cause. This was made more difficult due to the presence of a segfault in ffserver during the period where the bug was introduced so I first had to identify when and how that was fixed and then retrospectively apply that fix again for each step of the second git bisect to find the actual bug.
Anyway, the fruits of my labour are the innocent looking patch below to correct a couple of typos and define a valid range for two variables.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 12:59:07 +01:00
Mats Peterson
100167451a
lavc/rawdec: Remove monowhite switching code for 1 bpp AVI without a palette
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 03:53:38 +01:00
Michael Niedermayer
bb629792a2
avformat/avienc: Fix assertion failure with 256 palette entries
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 03:30:50 +01:00
Mats Peterson
a51d82b85c
lavf/avienc: Add palette after BITMAPINFOHEADER
...
lavf/riffenc: Write space for palette
tests/ref/vsynth: Update 1 bpp files for pal8
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-21 03:30:50 +01:00
Reto Kromer
f8d685270e
avienc: Remove unused variable 'ret'
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Timothy Gu <timothygu99@gmail.com >
2016-02-20 15:45:28 -08:00
Diego Biurrun
8caadfc53d
fate: Be silent when switching to Git branch
2016-02-20 17:03:40 +01:00
Rostislav Pehlivanov
029c069c6d
vc2enc: add support for Haar wavelet transforms
...
This commit adds support for the (simple, allowed in the spec, but
inferior in quality) Haar wavelet transforms.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-20 13:49:44 +00:00
Mark Harris
56e2cd9c04
avformat/icodec: Fix crash probing fuzzed file
...
Avoid invalid memory read/crash when frame offset >= 0xfffffff8.
Base64-encoded example: AAABADAwMDAwMAAAMAAwMDAw/P///w==
(The previous commit verifies that p->buf_size >= 22.)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-20 02:56:25 +01:00
Mark Harris
1b4fbf8080
avformat/icodec: ico probe with unknown data
...
Fix cases where unknown data (data beyond p->buf_size) could produce a
higher ico probe score than if the unknown data was known and valid.
For example:
Header: OK, 2 frames
Frame 0: Unknown (offset points beyond end of probe buffer)
Frame 1: Invalid
Previously this example had a score of 25, even though the score would
be 1 if the unknown frame was known to be valid or 0 if it was known
to be invalid. For this example the score is now 1.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-20 02:56:25 +01:00
Carl Eugen Hoyos
e6cbe3ffef
configure: Fix webm_dash_manifest demuxer standalone compilation.
2016-02-20 00:29:55 +01:00
Marton Balint
308ac2f7e2
ffmpeg: init input streams before opening encoders
...
Codec options of streams detected during avformat_find_stream_info are not set
therefore without this patch we initialize the encoders with decoder info
based on decoders without options.
This cause problems for probed DVB teletext streams where
avctx->subtitle_header depend on the txt_format setting.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-19 21:55:25 +01:00
Marton Balint
6c905dd3c2
avcodec/libzvbi-teletextdec: use common functions for matching data_unit_id and data_identifier
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-19 21:50:19 +01:00
Marton Balint
51afd9f4e1
avformat/dvbtxt: add raw demuxer for dvb teletext probing
...
Signed-off-by: Marton Balint <cus@passwd.hu >
2016-02-19 21:50:16 +01:00
Carl Eugen Hoyos
73781741b7
lavc/libvpx: Reindent after last commit.
2016-02-19 21:11:56 +01:00
Carl Eugen Hoyos
432be6362c
lavc/libvpx: Fix support for RGB colorspace.
...
Reported and tested by Nicolas George.
Fixes ticket #5249 .
2016-02-19 21:06:26 +01:00
Carl Eugen Hoyos
84d7933e3b
lavc/libvpx: Fix high-bitdepth pix_fmts on big endian.
2016-02-19 21:02:42 +01:00
Diego Biurrun
8d918a98aa
rtpdec: Use the right logging context
2016-02-19 20:38:18 +01:00
Diego Biurrun
d24bd96bdd
build: Disentangle VC-1 decoder and parser
2016-02-19 20:38:18 +01:00
Diego Biurrun
15a24614ae
build: Add vc1dsp component for more fine-grained dependencies
2016-02-19 20:38:18 +01:00
Diego Biurrun
f9fbd47467
msmpeg4data: Move WMV2 data tables to their own file
2016-02-19 20:38:18 +01:00
Diego Biurrun
79866803ff
msmpeg4data: K&R formatting cosmetics
2016-02-19 20:38:17 +01:00
Diego Biurrun
b10c33c5ea
build: Add missing mpegvideo dependency for the MSS2 and VC-1 decoders
2016-02-19 20:38:17 +01:00
Diego Biurrun
7d16d8533d
build: More precise dependencies for h264dsp
2016-02-19 20:38:17 +01:00
James Almer
76af0c7877
checkasm: fix dependencies for vf_blend tests
...
They will now compile if avcodec is disabled
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-19 16:31:55 -03:00
Luca Barbato
f273f7fb25
mkv: Force the full parsing of mp3
...
Some muxer might or might not fit incomplete mp3 frames in
their packets.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-19 17:35:33 +01:00
Luca Barbato
3ef98937f5
mov: Force the full parsing of mp3
...
Some muxer might or might not fit incomplete mp3 frames in
their packets.
Bug-Id: 899
CC: libav-stable@libav.org
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-19 17:35:26 +01:00
Michael Niedermayer
7ac962af38
avformat/avienc: Store pal8 palette
...
This can be made more efficient, but first and the main goal of this change is to
store it at all
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-19 15:47:33 +01:00
Diego Biurrun
b4a0f172c7
Revert all recent configure changes related to dependency resolution
...
This reverts commits 2edc718723 , a2bb771a3c , 21c750f240 , 8e7bea6dc6 .
2016-02-19 13:43:52 +01:00
Paul B Mahol
4956dc88d1
avcodec/cdxl: add support for raw videos with chunky format
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-19 10:45:54 +01:00
Michael Niedermayer
98a0053d0f
avcodec/h264: Execute error concealment before marking the frame as done.
...
Fixes race condition causing artifacts
Fixes Ticket4122
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-19 01:31:16 +01:00
Michael Niedermayer
9dd4dcde9c
avformat/avienc: Use avi_write_packet_internal() to store raw rgb in a more spec compliant way
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-18 21:26:50 +01:00
Michael Niedermayer
8fdee3ee8f
Revert 4 commits to configure which broke dependency handling
...
Revert "configure: Don't enable examples when --disable-everything is used"
reverted as the problematic commit will be reverted too
This reverts commit 02dfa64c08 .
Revert "Merge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'"
This reverts commit e8ebcb0034 , reversing
changes made to 3bff005be8 .
Revert "Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'"
This reverts commit 470bfab470 , reversing
changes made to f97ee815cf .
Revert "Revert "configure: Revert recent changes to disable-everything""
This reverts commit f97ee815cf .
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com >
Immediate commit suggested by BBB
2016-02-18 16:28:30 +01:00
Diego Biurrun
0d1229f1d2
voc: Split ff_voc_get_packet into a separate file
2016-02-18 15:35:46 +01:00
Diego Biurrun
624e235502
build: Introduce iso_media component
2016-02-18 15:35:46 +01:00
Diego Biurrun
ab9068cc9c
build: Fix typo in HEVC VDPAU hwaccel dependencies
2016-02-18 15:35:46 +01:00
Diego Biurrun
82454c3a82
build: Let the WTV demuxer select the MPEG-TS demuxer
...
The WTV demuxer depends on large parts of the MPEG-TS demuxer internals
anyway and fails to build without it.
2016-02-18 15:35:45 +01:00
Diego Biurrun
de3b134be3
build: Adjust mpeg4video parser dependencies
2016-02-18 15:35:45 +01:00
Diego Biurrun
2870972e9d
build: Fix mpegvideo component dependencies
2016-02-18 15:35:45 +01:00
Diego Biurrun
7403be9b1b
build: Fix dependencies for components relying on H.263 data tables
2016-02-18 15:35:45 +01:00
Diego Biurrun
e453129321
build: Add missing dependencies for eatqi decoder
2016-02-18 15:35:44 +01:00
Vittorio Giovara
71eaefa64a
build: Add missing celp_math dependency for G723_1 encoder and decoder
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-02-18 15:35:44 +01:00
Diego Biurrun
7c82d31cbe
checkasm: Use standard multiple inclusion guards
2016-02-18 15:35:44 +01:00
Diego Biurrun
3d8025d602
profiles: Add missing #endif comment
2016-02-18 15:35:44 +01:00
Diego Biurrun
6b96d2dcda
cosmetics: Drop particularly redundant silly comments
2016-02-18 15:35:43 +01:00
Diego Biurrun
29c2d06d67
cosmetics: Drop empty comment lines
2016-02-18 15:35:30 +01:00
Moritz Barsnick
6eaad752c1
lavf/options_table: mark use_wallclock_as_timestamps as boolean
...
It is only used in a boolean context. Also clarify its documentation.
Signed-off-by: Moritz Barsnick <barsnick@gmx.net >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-18 15:24:31 +01:00
Michael Niedermayer
07c7e71d20
avformat/avienc: Split avi_write_packet_internal() out
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-18 14:40:06 +01:00
Michael Niedermayer
090b673aba
avformat: add ff_reshuffle_raw_rgb()
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-18 14:40:06 +01:00
Thomas Mundt
da94d619f6
avfilter: add BobWeaver deinterlacing filter
2016-02-18 13:12:48 +01:00
Paul B Mahol
08acab85d3
avfilter: add loop filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-18 11:55:00 +01:00
Anton Khirnov
d847a40888
hwcontext_cuda/vdpau: add to skipheaders
2016-02-18 08:47:39 +01:00
Anton Khirnov
9c0bc1e980
qsv: add a missing #include
...
Needed for enum AVCodecID
2016-02-18 08:47:33 +01:00
Michael Niedermayer
5590ab45e0
ffmpeg: Check best_effort_timestamp after rescale
...
Fixes integer overflow
Fixes: Ticket5126
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-18 01:46:59 +01:00
Aman Gupta
5f5467e749
lavc/ccaption_dec: implement special and extended character sets
...
character sets implemented as defined in https://en.wikipedia.org/wiki/EIA-608#Characters
2016-02-17 21:32:18 +01:00
Aman Gupta
2f26b67d55
lavc/ccaption_dec: do not ignore repeated character commands
...
control codes in a cc stream can be repeated, and must be ignored.
however, repeated characters must not be ignored. the code attempted to
wipe prev_cmd in handle_char to allow repeated characters to be
processed, but prev_cmd would previously get reset _after_ handle_char()
i also moved the prev_cmd reset out from handle_char() so it can be
re-used for special character sets, which _must_ be ignored when
repeated.
2016-02-17 21:32:18 +01:00
Mark Reid
f09449daa4
tests/fate: added dnxhr parser regression test
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-17 21:16:14 +01:00
Michael Niedermayer
c4ac30909e
avutil/hwcontext: Remove duplicate ;
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-17 21:16:14 +01:00
Derek Buitenhuis
02dfa64c08
configure: Don't enable examples when --disable-everything is used
...
This resotres old behavior.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 19:20:49 +00:00
Paul B Mahol
38ed528fa5
avfilter/drawutils: >8 bit support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-17 18:59:56 +01:00
Derek Buitenhuis
6b706ce85f
Merge commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140'
...
* commit 'bd49be885e9ad6bae599c54473ba2fa2957eb140':
avconv_vdpau: use the hwcontext API to simplify code
Tested-by: wm4
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 16:47:05 +00:00
Derek Buitenhuis
d779d8d771
Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
...
* commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42':
hwcontext: add a VDPAU implementation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 16:16:34 +00:00
Derek Buitenhuis
1a708780f3
Merge commit '89923e418b494e337683442ab896d754bc07341a'
...
* commit '89923e418b494e337683442ab896d754bc07341a':
lavu: add a framework for handling hwaccel frames
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 16:12:25 +00:00
Derek Buitenhuis
26abd5149e
Merge commit '721a4efc0545548a241080b53ab480e34f366240'
...
* commit '721a4efc0545548a241080b53ab480e34f366240':
buffer: add support for pools using caller data in allocation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 16:07:16 +00:00
Derek Buitenhuis
ae3c0a9c1f
Merge commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605'
...
* commit 'c084d6d2cfb570b10d8784eb20cc696dfb7c5605':
buffersrc: default SAR to 0 (unknown) rather than 1
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 15:42:12 +00:00
Derek Buitenhuis
e8ebcb0034
Merge commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22'
...
* commit 'a2bb771a3cded8a05137c0effb34f61a2bc78e22':
configure: Restore the --enable-everything behaviour
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 15:39:35 +00:00
Derek Buitenhuis
3bff005be8
Merge commit '5e1beec944dacd6b4ed7d710125dd508c41ca969'
...
* commit '5e1beec944dacd6b4ed7d710125dd508c41ca969':
configure: Print which libraries will be built
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 15:39:16 +00:00
Derek Buitenhuis
470bfab470
Merge commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6'
...
* commit '21c750f240b9d0c41a258d1adee2d9f75ff378b6':
configure: Use `require` for the non-component options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 15:36:51 +00:00
Derek Buitenhuis
f97ee815cf
Revert "configure: Revert recent changes to disable-everything"
...
Following merges make it work as before.
This reverts commit cefad29df9 .
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-17 15:36:50 +00:00
Johan Ström
6c31c99289
hlsenc: add use_localtime_mkdir option to automatically create time-based directory
...
Use with -use_localtime, and set -hls_segment_filename to a path which
contains a subdirectory i.e. /some/path/%Y%m%d/%Y%m%dT%H%M%S-%s.ts
This will mkdir the %Y%m%d-part of the path if it does not already
exist.
In addition, each filename in the playlist output will be prefixed with
this subdirectory (if playlist and segment shares the same base path).
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-17 16:17:58 +01:00
Muhammad Faiz
7c11e727f6
avfilter/avf_showcqt: improve pts handling
...
correct output pts based on input pts
make seeking possible
output frame one by one on eof
tested with showinfo filter
Suggested-by: Paul B Mahol <onemda@gmail.com >
Reviewed-by: Paul B Mahol <onemda@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-17 16:13:09 +01:00
Michael Niedermayer
c351126ee9
avcodec/eatqi: print error on mb decode failure
...
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-17 16:13:09 +01:00
Paul B Mahol
4dc5880381
avfilter/vf_drawbox: reindent
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-17 09:42:46 +01:00
Paul B Mahol
5589698e0b
avfilter/vf_drawbox: add alpha pixel formats support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-17 09:39:05 +01:00
Michael Niedermayer
f6492a2ea8
swscale/x86/output: Fix yuv2planeX_16* with unaligned destination
...
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-17 04:47:51 +01:00
Michael Niedermayer
d07f6e5f1c
swscale/x86/output: Move code into yuv2planeX_mainloop
...
Reviewed-by: BBB
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-17 04:47:34 +01:00
Michael Niedermayer
2e8ad2d65a
avcodec/mpeg12: Remove duplicate block_last_index setting code
...
Based on 7c25ffe070 and 58dd885f9a
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-16 21:47:56 +01:00
Michael Niedermayer
5c02c95f2c
avcodec/mpeg12: Fix error return
...
Also remove a tab
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-16 21:46:00 +01:00
Michael Niedermayer
58f21b6c93
avformat/hls: fix potential integer overflow
...
This is not a regression
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-16 21:46:00 +01:00
Derek Buitenhuis
00bd237499
mov: Fix leftover merge conflict cruft
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 20:09:56 +00:00
Derek Buitenhuis
4e3185d208
Merge commit '5eb562831b3a9bea8026c413ef1338e06450d005'
...
This commit is a no-op.
* commit '5eb562831b3a9bea8026c413ef1338e06450d005':
mov: Use the correct type for size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 20:07:08 +00:00
Derek Buitenhuis
cbe3f28d0a
Merge commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2'
...
* commit '8d34a2f803c9ca9433b5a51bacbbe352e8d327e2':
vdpau: Support for VDPAU accelerated HEVC decoding
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 20:05:28 +00:00
Derek Buitenhuis
1466379059
Merge commit '8958c5c64d05453204642b55a7b8b44c93023b17'
...
This commit is a no-op.
* commit '8958c5c64d05453204642b55a7b8b44c93023b17':
hevc: Track long and short term RPS size for VDPAU
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:53:50 +00:00
Derek Buitenhuis
df61e4c241
Merge commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27'
...
This commit is a no-op.
* commit '8c399bd5cefd572eceb448981fcb6d4dbca35d27':
dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:52:36 +00:00
Derek Buitenhuis
0479cf8530
Merge commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad'
...
* commit 'e579d8b29cdb9b42c50a0fde277dfb047c1466ad':
lavf: Dump the cpb side data information
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:51:02 +00:00
Derek Buitenhuis
fab8d9717c
Merge commit 'd005ccc630e42daab8ec2afecf972d1551a9401a'
...
This commit is a no-op. Ours should be superior.
* commit 'd005ccc630e42daab8ec2afecf972d1551a9401a':
nvenc: rename a misnamed function
nvenc: merge input and output surface structs
nvenc: factor out the pixel format list
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:50:01 +00:00
Derek Buitenhuis
9a9f3f151f
Merge commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266'
...
This commit is a no-op.
* commit 'fb25d99b0a5e21fb8cc184c7a9d3736387778266':
buffersrc: do not discard the error from ff_filter_frame()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:48:39 +00:00
Derek Buitenhuis
c82d31808b
Merge commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437'
...
* commit 'f7d77b9a5dd42bf0f5dffecf590466b4c4239437':
eatqi: Remove MpegEncContext dependency
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:41:55 +00:00
Derek Buitenhuis
58dd885f9a
Merge commit '7c25ffe070c286874a8c3513f7504b90e1626b0c'
...
* commit '7c25ffe070c286874a8c3513f7504b90e1626b0c':
mpeg1: Make intra-block decoding independent of MpegEncContext
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:25:17 +00:00
Derek Buitenhuis
8e2105297d
Merge commit '249827f736db4c94dfcb24a3883aa4c04f9b119b'
...
* commit '249827f736db4c94dfcb24a3883aa4c04f9b119b':
mpeg12dec: Refactor mpeg1_decode_block_intra()
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:05:26 +00:00
Derek Buitenhuis
2ec66ff83d
Merge commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604'
...
* commit 'cdbaa436042ba59c3b2bd7e9652e9a14136fd604':
mpeg12dec: Always close reader on error
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 19:01:05 +00:00
Paul B Mahol
c4ed213675
avfilter/f_streamselect: check if map is available
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-16 19:18:31 +01:00
Derek Buitenhuis
ea1f47757b
Merge commit '7a00653be6b13131ce1b2cdeca696429f57caaf8'
...
* commit '7a00653be6b13131ce1b2cdeca696429f57caaf8':
tiny_psnr: Support large files
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 18:11:05 +00:00
Lou Logan
ddc9a587f9
doc/filters: remove redundant example
...
Newer example in blend from f80b475 is faster and simpler.
Signed-off-by: Lou Logan <lou@lrcd.com >
2016-02-16 08:54:19 -09:00
Derek Buitenhuis
55cada3010
Merge commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae'
...
This commit is a no-op. FFmpeg already has this.
* commit '99214d42a902c8392d7887c08fdc5dc1fc2475ae':
dnxhd: Make the encoder message friendlier
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:48:30 +00:00
Derek Buitenhuis
1c417bad61
Merge commit '34c9eba982c75196392a3b0b245dd34297c4511d'
...
* commit '34c9eba982c75196392a3b0b245dd34297c4511d':
configure: Refactor toolchain flag setting
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:44:33 +00:00
Derek Buitenhuis
a236e4e8b8
Merge commit 'dd53af4b37c7790ce26065b36d5655c1af38b295'
...
This commit is a no-op. I don't want to enrange Certain People
who like to --disable-*.
* commit 'dd53af4b37c7790ce26065b36d5655c1af38b295':
avplay: drop support for building without lavfi
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:40:08 +00:00
Derek Buitenhuis
8bbca8de39
Merge commit '5781bfae0cf4271278a8bea176d615cb5c222335'
...
This commit is a no-op.
* commit '5781bfae0cf4271278a8bea176d615cb5c222335':
flacenc: Load default prediction_order parameters if none is selected
asfdec: make sure packet_size is non-zero before seeking
asfdec: check for too small size in asf_read_unknown
asfdec: check avio_skip in asf_read_simple_index
asfdec: break if EOF is reached after asf_read_packet_header
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:37:47 +00:00
Derek Buitenhuis
e7b8ec8b6f
Merge commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3'
...
This commit is a no-op.
* commit '389b79842c67b1f5730215a752a5f89cb1b8d9a3':
msvc: Fix libx264 linking
doc: Improve the channelsplit example
configure: Support MSYS2 mingw-w64 64bit
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:34:24 +00:00
Vittorio Giovara
b92962436b
mov: Fix the format specifier type for size
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-16 18:25:47 +01:00
Derek Buitenhuis
04e4166536
Merge commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45'
...
* commit 'e280fe13291e9c712a5f4aa13b5263f3e8afed45':
v210: Use separate sample_factors
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:23:32 +00:00
Derek Buitenhuis
6bff2b5f6a
Merge commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7'
...
This commit is a no-op.
* commit '15ec7aa4170ed05ad1b17000ef1e3940d0a0c5e7':
v210: Add avx2 version of the 10-bit line encoder
v210: Add avx2 version of the 8-bit line encoder
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:21:29 +00:00
Derek Buitenhuis
dc22269b23
Merge commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038'
...
This commit is a no-op.
* commit '1ba1fede9dfe03dc48862e5e0530cca7192f5038':
flacenc: Restore defaults and range for {min, max}_prediction_order
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:12:00 +00:00
Derek Buitenhuis
113c256533
Merge commit '60f0fde3092d18d4d36555962c192af8691a099c'
...
This commit is a no-op.
* commit '60f0fde3092d18d4d36555962c192af8691a099c':
libx264: Make sure to preserve default option values
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:06:54 +00:00
Derek Buitenhuis
2f78be0019
Merge commit '77a44f577b644a328dcf90cde11d2ecae69eda05'
...
This commit is a no-op.
* commit '77a44f577b644a328dcf90cde11d2ecae69eda05':
configure: add missing avx2 support check
x86: Add ymm_reg struct
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:03:30 +00:00
Derek Buitenhuis
8f8381bf03
Merge commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a'
...
* commit 'eafb05fcf37cd19a910ca3b17824384f9006bc0a':
v210: x86: Add the correct guards around the asm code
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:02:56 +00:00
Derek Buitenhuis
4401f07f4d
Merge commit '4709f72115e4028a1cb43e916925678bfceef870'
...
This commit is a no-op.
* commit '4709f72115e4028a1cb43e916925678bfceef870':
lavfi: Use AV_CEIL_RSHIFT where needed
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 17:00:52 +00:00
Derek Buitenhuis
56475e885b
Merge commit 'e80307140f736f593ee643affa015333d7c5e27f'
...
* commit 'e80307140f736f593ee643affa015333d7c5e27f':
yuv4mpegenc: Use AV_CEIL_RSHIFT where needed
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 16:57:32 +00:00
Derek Buitenhuis
73bd20c4d2
Merge commit '6695f178a5929eab91d3da7e9023999f1774bd0e'
...
* commit '6695f178a5929eab91d3da7e9023999f1774bd0e':
pixdesc: Use AV_CEIL_RSHIFT in documentation
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 16:55:28 +00:00
Derek Buitenhuis
3f462fcf76
Merge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'
...
* commit '1546a41adae818b340acdd9b5dacd6d0a92b6507':
pixdesc: Drop unneeded deprecation warning guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 16:54:12 +00:00
Derek Buitenhuis
c63da6e916
Merge commit '9cac1b4b4f1532fb2aeef54799285360656be5eb'
...
* commit '9cac1b4b4f1532fb2aeef54799285360656be5eb':
qsvenc: Add private option to replace coder_type
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 16:51:45 +00:00
Derek Buitenhuis
32766877b4
Merge commit 'eef9f06508354d1c7d5624c1c18997e7974288f1'
...
This commit is a no-nop.
* commit 'eef9f06508354d1c7d5624c1c18997e7974288f1':
avplay: Allow to override the codec
avplay: Statically allocate the player state
avplay: Rename cur_stream to player
avplay: Rename VideoState to PlayerState
avplay: Allocate the refresh thread next to the decode thread
avplay: Move the stream setup in the main thread
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 16:49:19 +00:00
Derek Buitenhuis
d0fc5de3a6
Merge commit '81306fd4bdeb5c17d4db771e4fec684773b5790f'
...
* commit '81306fd4bdeb5c17d4db771e4fec684773b5790f':
hls: eliminate ffurl_* usage
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 16:27:14 +00:00
Paul B Mahol
a588c7ac13
avfilter: add fieldhint filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2016-02-16 16:12:44 +01:00
Derek Buitenhuis
15d9645fb4
swscale/slice: Actually use the buffers' strides
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-16 14:25:25 +00:00
Mats Peterson
b86ba37096
lavc/rawdec: Retrieve nut palette from packets
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-16 14:49:12 +01:00
Carl Eugen Hoyos
d0962160e0
lavfi/elbg: Make the pal8 output opaque.
2016-02-16 09:16:32 +01:00
Rostislav Pehlivanov
3b1d1437a0
vc2enc: print the average quantization index at the end
...
Similar to how the AAC encoder does it.
0 means the video's been compressed losslessly/almost losslessly
thoughout. Generally, the higher, the worse.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-15 23:54:52 +00:00
Timothy Gu
5d82370930
RELEASE: Update to 3.0.git
2016-02-15 10:20:33 -08:00
Luca Barbato
2edc718723
configure: Relax the implication of --enable for components
...
Do not error out if some subcomponents cannot be enabled.
Reported-By: RT|AO
2016-02-15 17:57:43 +01:00
KO Myung-Hun
346ec91764
MAINTAINERS: add myself as an OS/2 maintainer
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-15 13:22:07 +01:00
Rostislav Pehlivanov
7cdea450c6
vc2enc: fix use of uninitialized variables in the rate control system
...
Fixes: CID1352550
Fixes: CID1352549
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com >
2016-02-15 12:12:16 +00:00
Hendrik Leppkes
a655bc8344
ffmpeg_dxva2: add a profile check for hevc
2016-02-15 12:34:19 +01:00
Hendrik Leppkes
1ec14612a5
ffmpeg_dxva2: support hevc main10 decoding
2016-02-15 12:34:16 +01:00
Hendrik Leppkes
ccb94789e2
hevc: support Main10 decoding through dxva2
2016-02-15 12:33:50 +01:00
Diego Biurrun
47570dbde8
fft: ppc: Place ff_fft_calc_interleave_altivec() under correct ifdefs
...
Also fix #endif comments in the FFT init code.
2016-02-15 11:58:04 +01:00
Michael Niedermayer
295de3efc5
fate/source-check.sh: Use "git show" instead of git --version to test for git
...
This fixes fate with non git source trees
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
2016-02-15 03:40:32 +01:00
Metaksakis Georgios
00c73c475e
lavd/gdigrab: mouse dpi awareness
...
correct mouse location on hidpi screens.
fixes ticket #5008
Signed-off-by: Matt Oliver <protogonoi@gmail.com >
2016-02-15 10:11:11 +11:00
James Almer
70d685a77f
x86: use the new helper macros where useful
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-14 20:00:21 -03:00
James Almer
73a4589d4b
x86: add some more helper macros to check for slow cpuflags
...
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: James Almer <jamrial@gmail.com >
2016-02-14 20:00:17 -03:00
Anton Khirnov
c15f6098b1
avconv: pass the hw context from filters to the encoder
2016-02-14 22:33:26 +01:00
Anton Khirnov
871d0930d4
nvenc: support CUDA frames as input
2016-02-14 22:31:47 +01:00
Anton Khirnov
7b3214d005
lavc: add a field for passing AVHWFramesContext to encoders
2016-02-14 22:29:52 +01:00
Anton Khirnov
21f7cd4acd
lavfi: add a filter for uploading normal frames to CUDA
2016-02-14 22:25:38 +01:00
Anton Khirnov
1bf3413461
avconv: use the new buffersrc parameters API
...
The timebase change in the zmbv-8bit test is due to the fact that
previously the timebase string was evaluated as floating point, then
converted to a rational. After this commit, the timebase is passed
directly as is.
2016-02-14 22:22:41 +01:00
Anton Khirnov
b3dd30db0b
lavfi: pass the hw frames context through the filter chain
2016-02-14 22:21:00 +01:00
Anton Khirnov
ad884d1002
hwcontext: add a CUDA implementation
2016-02-14 22:08:33 +01:00
Anton Khirnov
7bc780cd44
pixfmt: add a CUDA hwaccelled format
2016-02-14 22:08:22 +01:00
Anton Khirnov
c51b2c79a7
Allow linking to CUDA dynamically instead of dlopen()ing it at runtime
2016-02-14 22:08:13 +01:00
Anton Khirnov
bd49be885e
avconv_vdpau: use the hwcontext API to simplify code
2016-02-14 22:07:44 +01:00
Anton Khirnov
a001ce31bc
hwcontext: add a VDPAU implementation
2016-02-14 22:06:04 +01:00
Anton Khirnov
89923e418b
lavu: add a framework for handling hwaccel frames
2016-02-14 21:36:59 +01:00
Anton Khirnov
721a4efc05
buffer: add support for pools using caller data in allocation
...
This should allow using more complex allocators than simple malloc
wrappers.
2016-02-14 21:24:39 +01:00
Anton Khirnov
c084d6d2cf
buffersrc: default SAR to 0 (unknown) rather than 1
...
It makes more sense to not claim anything about the SAR if we don't know
anything. No changes in the FATE tests, since this is what avconv ends
up doing anyway.
2016-02-14 21:24:24 +01:00
Luca Barbato
a2bb771a3c
configure: Restore the --enable-everything behaviour
...
Make sure that the minimum set of dependencies needed by the tools
and the examples are enabled.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-14 11:44:57 +01:00
Luca Barbato
5e1beec944
configure: Print which libraries will be built
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-14 11:44:57 +01:00
Luca Barbato
21c750f240
configure: Use require for the non-component options
...
And make sure to enable all the components needed
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-14 11:44:57 +01:00
Luca Barbato
5eb562831b
mov: Use the correct type for size
...
An AVIO offset is int64_t.
Bug-Id: 921
2016-02-14 11:44:38 +01:00
Philip Langdale
8d34a2f803
vdpau: Support for VDPAU accelerated HEVC decoding
...
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-13 14:42:38 +01:00
Philip Langdale
8958c5c64d
hevc: Track long and short term RPS size for VDPAU
...
Today, we track the short term RPS size for DXVA, but only if the
SliceHeader RPS is being used. Otherwise it's left uninitialized.
NVIDIA's VDPAU implementation requires that the size be accurately
tracked even if an SPS RPS is being used. In this case, it's really
counting the size of the RPS idx information, but you end up with
mangled output if the value is not accurate.
VDPAU also needs the size of the long term RPS.
Signed-off-by: Philip Langdale <philipl@overt.org >
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-13 14:24:37 +01:00
Hendrik Leppkes
8c399bd5ce
dxva2_hevc: properly signal the num_delta_pocs from the SPS RPS
...
ucNumDeltaPocsOfRefRpsIdx needs to contain the flat value from the SPS RPS,
and not the final computed value from the slice header RPS, as this calculation
is done internally by the driver again.
Sample-Id: http://trailers.divx.com/hevc/Sintel_4k_27qp_24fps_1aud_9subs.mkvi
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net >
2016-02-13 14:19:54 +01:00
Luca Barbato
e579d8b29c
lavf: Dump the cpb side data information
2016-02-13 14:03:52 +01:00
Anton Khirnov
d005ccc630
nvenc: rename a misnamed function
...
This function copies the encoded bistream into the caller's packet,
calling it 'get_frame' is misleading.
2016-02-12 10:20:11 +01:00
Anton Khirnov
118beda355
nvenc: merge input and output surface structs
...
An input frame always corresponds to exactly one output packet, so there
is no point in complicating the situation by managing them separately.
2016-02-12 10:19:40 +01:00
Anton Khirnov
28259c13db
nvenc: factor out the pixel format list
2016-02-12 10:19:26 +01:00
Anton Khirnov
fb25d99b0a
buffersrc: do not discard the error from ff_filter_frame()
2016-02-12 10:18:13 +01:00
Vittorio Giovara
f7d77b9a5d
eatqi: Remove MpegEncContext dependency
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-02-09 20:04:59 +01:00
Vittorio Giovara
7c25ffe070
mpeg1: Make intra-block decoding independent of MpegEncContext
...
This allows untangling the eatqi decoder from the MPEG-1 decoder.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-02-09 20:04:59 +01:00
Diego Biurrun
249827f736
mpeg12dec: Refactor mpeg1_decode_block_intra()
...
Reduce variable scope, improve variable name, drop pointless ff_dlog(),
merge variable declaration and initialization, whitespace cosmetics.
2016-02-09 20:04:58 +01:00
Vittorio Giovara
cdbaa43604
mpeg12dec: Always close reader on error
...
A reader left open may lead to hangs.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2016-02-09 20:04:58 +01:00
Thomas Lee
7a00653be6
tiny_psnr: Support large files
...
If an input file is bigger than 2GB (assume sizeof(int) == 4)),
size0/size1 will overflow, making stddev and PSNR invalid.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-09 20:03:34 +01:00
Luca Barbato
99214d42a9
dnxhd: Make the encoder message friendlier
2016-02-09 20:02:31 +01:00
Diego Biurrun
34c9eba982
configure: Refactor toolchain flag setting
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-09 20:02:31 +01:00
Anton Khirnov
dd53af4b37
avplay: drop support for building without lavfi
...
lavfi has been considered to be stable for a while now, so it is enabled
in most configurations. Supporting avplay without lavfi requires a lot
of nontrivial ifdef mess for no good reason.
2016-02-09 11:31:24 +01:00
Michael Niedermayer
5781bfae0c
flacenc: Load default prediction_order parameters if none is selected
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc >
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-02-08 15:00:29 -05:00
Andreas Cadhalpun
2e6ba1993e
asfdec: make sure packet_size is non-zero before seeking
...
This fixes infinite loops due to seeking back.
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-07 03:12:33 +01:00
Andreas Cadhalpun
bf50607ab7
asfdec: check for too small size in asf_read_unknown
...
This fixes infinite loops due to seeking back.
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-07 03:12:33 +01:00
Andreas Cadhalpun
e4d1621c6e
asfdec: check avio_skip in asf_read_simple_index
...
The loop can be very long, even though the file is very short.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-07 03:12:33 +01:00
Andreas Cadhalpun
a32dbf2aed
asfdec: break if EOF is reached after asf_read_packet_header
...
asf_read_payload can unset eof_reached, so check it also before calling
that function.
This fixes infinite loops.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com >
Signed-off-by: Alexandra Hájková <alexandra@khirnov.net >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-07 03:12:33 +01:00
Henrik Gramner
389b79842c
msvc: Fix libx264 linking
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-06 13:56:39 +01:00
Vicente Jimenez Aguilar
f428893c17
doc: Improve the channelsplit example
...
Expand LFE acronym (lfe.wav -> low_frecuency_effects.wav) as with others filenames
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-06 13:19:25 +01:00
Luca Barbato
a38a4f44b5
configure: Support MSYS2 mingw-w64 64bit
2016-02-06 12:07:47 +01:00
Luca Barbato
e280fe1329
v210: Use separate sample_factors
...
The 10bit and the 8bit functions can now be implemented to process
a different amount of samples.
And while at it simplify a little the code.
2016-02-01 13:40:07 +01:00
James Darnley
15ec7aa417
v210: Add avx2 version of the 10-bit line encoder
...
Around 25% faster than the ssse3 version.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-01 13:40:07 +01:00
James Darnley
d29237e557
v210: Add avx2 version of the 8-bit line encoder
...
Around 35% faster than the avx version.
Signed-off-by: Henrik Gramner <henrik@gramner.com >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-02-01 13:40:07 +01:00
Derek Buitenhuis
1ba1fede9d
flacenc: Restore defaults and range for {min, max}_prediction_order
...
This was broken in 243df1351d .
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com >
2016-02-01 00:57:43 +01:00
Vittorio Giovara
60f0fde309
libx264: Make sure to preserve default option values
...
The private options chromaoffset, sc_threshold, and noise_reduction
were set to 0 rather than -1, and were always initializing values
in libx264 rather than letting the library use its default.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com >
2016-02-01 00:35:37 +01:00
James Almer
77a44f577b
configure: add missing avx2 support check
...
AVX2 support was introduced in Yasm 1.2.0 and NASM 2.10, and the
oldest versions currently supported are Yasm 0.8.0 and NASM 2.03
Signed-off-by: James Almer <jamrial@gmail.com >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-28 00:43:23 +01:00
James Almer
b624f0660b
x86: Add ymm_reg struct
...
Needed to declare 32-byte long constants
Signed-off-by: James Almer <jamrial@gmail.com >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-28 00:41:19 +01:00
Luca Barbato
eafb05fcf3
v210: x86: Add the correct guards around the asm code
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-26 23:31:57 +01:00
Vittorio Giovara
4709f72115
lavfi: Use AV_CEIL_RSHIFT where needed
2016-01-25 12:09:48 -05:00
Vittorio Giovara
e80307140f
yuv4mpegenc: Use AV_CEIL_RSHIFT where needed
2016-01-25 12:02:44 -05:00
Vittorio Giovara
6695f178a5
pixdesc: Use AV_CEIL_RSHIFT in documentation
2016-01-25 12:02:20 -05:00
Vittorio Giovara
1546a41ada
pixdesc: Drop unneeded deprecation warning guards
2016-01-25 12:01:12 -05:00
Vittorio Giovara
9cac1b4b4f
qsvenc: Add private option to replace coder_type
...
Missing from be00ec832c .
2016-01-25 12:00:16 -05:00
Luca Barbato
eef9f06508
avplay: Allow to override the codec
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-25 09:12:02 +01:00
Luca Barbato
6fa464f8d2
avplay: Statically allocate the player state
...
And move the resource deallocation in stream_open failure path.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-25 09:12:02 +01:00
Luca Barbato
611ba89b89
avplay: Rename cur_stream to player
...
The name was misleading.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-25 09:12:02 +01:00
Luca Barbato
21bbc345cc
avplay: Rename VideoState to PlayerState
...
The structure is not video-specific.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-25 09:12:02 +01:00
Luca Barbato
fdd464cb70
avplay: Allocate the refresh thread next to the decode thread
...
It does not belong to the stream setup.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-25 09:12:02 +01:00
Luca Barbato
f22f900594
avplay: Move the stream setup in the main thread
...
And refactor the code in preparation of the following
patches.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2016-01-25 09:10:34 +01:00
Anton Khirnov
81306fd4bd
hls: eliminate ffurl_* usage
...
Now all IO should go through the IO callbacks and be interceptable by
the caller.
2016-01-24 16:50:13 +01:00