summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* avformat/dashdec: add trace message for get the logic output messageSteven Liu2018-09-05
| | | | Signed-off-by: Steven Liu <lq@onvideo.cn>
* avformat/dashdec: reindent code for previous commitSteven Liu2018-09-05
| | | | Signed-off-by: Steven Liu <lq@onvideo.cn>
* avformat/dashdec: remove redundant codeSteven Liu2018-09-05
| | | | Signed-off-by: Steven Liu <lq@onvideo.cn>
* avformat/dashdec: refine adaptionset attribute membersSteven Liu2018-09-05
| | | | Signed-off-by: Steven Liu <lq@onvideo.cn>
* avformat/dashdec: refine mpd element of attribute name availabilityEndTimeSteven Liu2018-09-05
| | | | Signed-off-by: Steven Liu <lq@onvideo.cn>
* avformat/hlsenc: rename option from use_localtime to strftimeSteven Liu2018-09-05
| | | | | | | fix ticket: 7393 indent option name to segment Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* avcodec/mips: [loongson] simplify the usage of intermediate variable addr.Shiyou Yin2018-09-04
| | | | | | | | | | Simplify the usage of intermediate variable addr in following functions: 1. ff_put_pixels4_8_mmi 2. ff_put_pixels8_8_mmi 3. ff_put_pixels16_8_mmi 4. ff_avg_pixels16_8_mmi. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec: [loongson] fix bug of mss2-wmv failed in fate test.Shiyou Yin2018-09-04
| | | | | | | | | | | | Failed case: mss2-wmv In following functions, pmullh was used to multiply two 16-bit data, this will cause data overflow. 1. ff_vc1_inv_trans_8x8_dc_mmi 2. ff_vc1_inv_trans_8x8_mmi 3. ff_vc1_inv_trans_8x4_mmi 4. ff_vc1_inv_trans_4x8_mmi 5. ff_vc1_inv_trans_4x4_mmi Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avformat/libsrt: fix merge of payload_size optionMarton Balint2018-09-03
| | | | | | Fixes a compile error and re-adds pkt_size as a url?option as well. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/av1: zero initialize the seq_params structJames Almer2018-09-02
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit 'e1e3a12242347dd11174b2fb9ddac8dc8df16224'James Almer2018-09-02
|\ | | | | | | | | | | | | * commit 'e1e3a12242347dd11174b2fb9ddac8dc8df16224': libopenh264: Add support for decoding of b-frames Merged-by: James Almer <jamrial@gmail.com>
| * libopenh264: Add support for decoding of b-framesMartin Storsjö2018-08-01
| | | | | | | | | | | | | | The current git master version of libopenh264 supports decoding of b-frames. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f'James Almer2018-09-02
|\| | | | | | | | | | | | | | | | | * commit 'c011beda2611acfeb6f67d4fdf30d1eceed9e62f': avconv: make sure packets put into the muxing FIFO are refcounted This commit is a noop, see 33580a8625c77591919b6155a48da04dccc8d398 Merged-by: James Almer <jamrial@gmail.com>
| * avconv: make sure packets put into the muxing FIFO are refcountedwm42018-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some callers (like do_subtitle_out(), or do_streamcopy()) call this with an AVPacket that is not refcounted. This can cause undefined behavior. Calling av_packet_move_ref() does not make a packet refcounted if it isn't yet. (And it can't be made to, because it always succeeds, and can't return ENOMEM.) Call av_packet_ref() instead to make sure it's refcounted. Cc: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit 'c1bcd321ea2c2ae1765a1e64f03278712221d726': avcodec/qsv: fix async support Merged-by: James Almer <jamrial@gmail.com>
| * avcodec/qsv: fix async supportDmitry Rogozhkin2018-07-26
| | | | | | | | | | | | | | | | | | | | | | Current implementations of qsv components incorrectly work with async level, they actually try to work in async+1 level stepping into MFX_WRN_DEVICE_BUSY and polling loop. This change address this misbehaviour. Signed-off-by: Dmitry Rogozhkin <dmitry.v.rogozhkin@intel.com> Cc: Maxym Dmytrychenko <maxim.d33@gmail.com> Cc: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit 'f25117a4286505b38c12466ef04459471de3c1b0'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit 'f25117a4286505b38c12466ef04459471de3c1b0': libsrt: Pass the correct pointer for the passphrase Merged-by: James Almer <jamrial@gmail.com>
| * libsrt: Pass the correct pointer for the passphraseSven Dueking2018-07-13
| | | | | | | | | | | | The passphrase field is a pointer already. Bug-Id: https://github.com/Haivision/srt/issues/416
* | Merge commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit 'b93026777aada7742583d8c5ab079e9f4dfe9a5d': libfdk-aac: Use enum names instead of literal numbers for the output format Merged-by: James Almer <jamrial@gmail.com>
| * libfdk-aac: Use enum names instead of literal numbers for the output formatMartin Storsjö2018-07-06
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '52fd2afce8436c59c05765f3a6e95f9adb6f9f2f'James Almer2018-09-02
|\| | | | | | | | | | | | | | | | | * commit '52fd2afce8436c59c05765f3a6e95f9adb6f9f2f': configure: fix inline asm checks This commit is a noop, see ad94f1c8abe68a2b38536cc96a31327c6be7b105 Merged-by: James Almer <jamrial@gmail.com>
| * configure: fix inline asm checksJohn Cox2018-06-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8c893aa3cd5 removed quotes that were required to detect inline asm: check_insn armv5te qadd r0, r0, r0 .../test.c:1:34: error: expected string literal in 'asm' void foo(void){ __asm__ volatile(qadd r0, r0, r0); } The correct code is: void foo(void){ __asm__ volatile("qadd r0, r0, r0"); } Commit message written by Frank Liberato <liberato@chromium.org> Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '4ce701b4e640d4723a4005d664f31f8342fac40e'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit '4ce701b4e640d4723a4005d664f31f8342fac40e': qsvenc: remove vcm option on Linux Merged-by: James Almer <jamrial@gmail.com>
| * qsvenc: remove vcm option on LinuxZhong Li2018-06-11
| | | | | | | | | | | | | | | | | | 1. vcm mode is only available for H264. 2. vcm is not supported on Linux, but it is shown when run "./avconv -h encoder=h264_qsv |grep vcm". This shouldn't happen. Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit 'f8060865f3e1a16c62e0d337ef0979b6ee4ba457': qsvenc: use the compression_level to replace private option Merged-by: James Almer <jamrial@gmail.com>
| * qsvenc: use the compression_level to replace private optionZhong Li2018-06-11
| | | | | | | | | | | | | | | | Use a common way to control target_usage, keeping consistent with vaapi encoders. The private option preset is kept only for compatibility. Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Maxym Dmytrychenko <maxim.d33@gmail.com>
* | Merge commit 'a507af97eef468238d545ff954a39d7432832e54'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit 'a507af97eef468238d545ff954a39d7432832e54': avformat/libsrt: add latency options and deprecate tspbdelay Merged-by: James Almer <jamrial@gmail.com>
| * avformat/libsrt: add latency options and deprecate tspbdelaySven Dueking2018-06-04
| | | | | | | | | | Signed-off-by: Sven Dueking <sven.dueking@nablet.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit 'ea8ae27a5e112d06fd5625f640e40849e6313f0c': avformat/libsrt: add payload size option Merged-by: James Almer <jamrial@gmail.com>
| * avformat/libsrt: add payload size optionSven Dueking2018-06-03
| | | | | | | | | | Signed-off-by: Sven Dueking <sven.dueking@nablet.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '35ed7f93dbc72d733e454ae464b1324f38af62a0'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit '35ed7f93dbc72d733e454ae464b1324f38af62a0': qsvenc: Add an option to disable MFE mode Merged-by: James Almer <jamrial@gmail.com>
| * qsvenc: Add an option to disable MFE modeZhong Li2018-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | Provide proper aliases to enable/disable MFE. The numeric values are ambiguous and misleading (e.g: user may misunderstand setting mfmode to 1 is to enable MFE but actually it is to disable MFE, and set it to be 5 or above is meaningless). MFX_MF_MANUAL hasn't been exposed since it is to be implemented. Signed-off-by: Zhong Li <zhong.li@intel.com> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit 'e368b0cbfa3fdc627c331e34556f8e39296d04d5': tls_mbedtls: Use non-deprecated header file Merged-by: James Almer <jamrial@gmail.com>
| * tls_mbedtls: Use non-deprecated header fileDiego Biurrun2018-04-26
| | | | | | | | /usr/include/mbedtls/net.h:29:2: warning: #warning "Deprecated header file: Superseded by mbedtls/net_sockets.h" [-Wcpp]
* | avcodec/h264_refs: Document last if() in ff_h264_execute_ref_pic_marking()Michael Niedermayer2018-09-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/h264_refs: Detect more random access points which are not markedMichael Niedermayer2018-09-03
| | | | | | | | | | | | | | Fixes: nature_360-7501616eb5eafca5-1111.mp4 Reported-by: Thierry Foucu <tfoucu@google.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | iavcodec/zmbv: Avoid reallocating cur/prev buffers if they are large enoughMichael Niedermayer2018-09-03
| | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 9721/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZMBV_fuzzer-5650321660444672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/zmbv: remove useless zero check on dimensionsMichael Niedermayer2018-09-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/ffv1dec_template: do not ignore the return code of decode_line()Michael Niedermayer2018-09-03
| | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 9710/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4918894635515904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/wmv2dec: skip frames that have only skiped MBsMichael Niedermayer2018-09-03
| | | | | | | | | | | | | | | | | | | | | | This requires us to pre-parse the skip data, as we want to detect this before allocating all the arrays Fixes: Timeout Fixes: 9708/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WMV2_fuzzer-5729709861109760 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/ra144: Fix undefined integer overflow in add_wav()Michael Niedermayer2018-09-03
| | | | | | | | | | | | | | | | 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>
* | avcodec/indeo4: Check dimensions in decode_pic_hdr()Michael Niedermayer2018-09-03
| | | | | | | | | | | | | | | | Fixes: Timeout Fixes: 9654/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_INDEO4_fuzzer-6289863463665664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'ad5bbc408637cffd4cc2ba990abef529cf5fa6a3'James Almer2018-09-02
|\| | | | | | | | | | | | | | | | | * commit 'ad5bbc408637cffd4cc2ba990abef529cf5fa6a3': configure: Rename require_header() --> require_headers() This commit is a noop, see ce47f1589e9f5a6cf8372a269bdd862ff0cc3f91 Merged-by: James Almer <jamrial@gmail.com>
| * configure: Rename require_header() --> require_headers()Diego Biurrun2018-04-25
| | | | | | | | This renaming was overlooked in the previous check_header() rename.
* | Merge commit '4130e05ff496667565ff7c386a514bd46434eddf'James Almer2018-09-02
|\| | | | | | | | | | | | | | | | | * commit '4130e05ff496667565ff7c386a514bd46434eddf': libavformat: add mbedTLS based TLS This commit is a noop, see c24d247e2c2ccd13fda09fe4194bf2ff0eb42256 Merged-by: James Almer <jamrial@gmail.com>
| * libavformat: add mbedTLS based TLSThomas Volkert2018-04-25
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '39f3b6f3fc2b46b405b680cce3599f1b370e342d'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit '39f3b6f3fc2b46b405b680cce3599f1b370e342d': configure: Move add_fooflags() helper functions into canonical order Merged-by: James Almer <jamrial@gmail.com>
| * configure: Move add_fooflags() helper functions into canonical orderDiego Biurrun2018-04-20
| |
* | Merge commit '5691c746cf62e69806aae1baf0a6e8252d519444'James Almer2018-09-02
|\| | | | | | | | | | | | | * commit '5691c746cf62e69806aae1baf0a6e8252d519444': configure: Group toolchain parameter mangling functions together Merged-by: James Almer <jamrial@gmail.com>
| * configure: Group toolchain parameter mangling functions togetherDiego Biurrun2018-04-20
| |