summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Changelog: replace <next> by 4.0n4.0Michael Niedermayer2018-04-201-1/+1
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* lavf/http.c: Free allocated client URLContext in case of error.Stephan Holljes2018-04-201-0/+4
| | | | | | | Signed-off-by: Stephan Holljes <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 7b6b8c92652d6683d97515352e4a9a4147b7da7c) Signed-off-by: Michael Niedermayer <[email protected]>
* avdevice/android_camera: Fix AVClass.versionMichael Niedermayer2018-04-201-1/+1
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 13b77af2f0b56d6c87bb147947337981c21f4245) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec: Fix AVClass .versionMichael Niedermayer2018-04-203-4/+4
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c0bce367e4932f0fb09195e6978ac1a5a60480a4) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/sheervideodata: Fix libavutil includeMichael Niedermayer2018-04-201-1/+1
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 3dfe3436ac78607d7baf6f1f7f48691343d9d929) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/sbc: Fix non static function prefixMichael Niedermayer2018-04-204-4/+4
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 9f1b99e7d076c9de1fefe971f1c70c96ebcf071b) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/opusenc_psy: Fix warning: ISO C90 forbids mixed declarations and codeMichael Niedermayer2018-04-201-3/+2
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit f8b17fe33233237eea304d4fb0636539a131c1b2) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/dsicinvideo: Fail if there is only a small fraction of the data ↵Michael Niedermayer2018-04-201-0/+7
| | | | | | | | | | | | 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 <[email protected]> (cherry picked from commit 5549488bbf3a23c0fb9833cefc6354f97055dd96) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/dsicinvideo: Propagate errors from cin_decode_rle()Michael Niedermayer2018-04-201-4/+12
| | | | | | Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 942217b153a9bff2d17463957abd772fcd72b400) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/dfa: Check dimension against maximumMichael Niedermayer2018-04-201-1/+1
| | | | | | | | | | | | | 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 <[email protected]> (cherry picked from commit 9d5a4fcfbb51edc871bdb1c67a88223cbfb1c0e4) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/cinepak: Skip empty framesMichael Niedermayer2018-04-201-0/+7
| | | | | | | | | | 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 <[email protected]> (cherry picked from commit 9033920bec9ccf17de205fc17c2b330906b200f5) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/cinepak: move some checks prior to frame allocationMichael Niedermayer2018-04-201-5/+22
| | | | | | | | | | 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 <[email protected]> (cherry picked from commit 2324ef1ff32e5effd6f295bca80580ae4816be0b) Signed-off-by: Michael Niedermayer <[email protected]>
* swresample/arm: remove unintentional relocation.Rahul Chaudhry2018-04-201-2/+4
| | | | | | | | | | | | | | | | | | | | 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: https://github.com/freedesktop/gstreamer-cerbero/commit/41556c415739fbc3a72c7eaee7e70a565b719b2f Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit b22db4f465c9adb2cf1489e04f7b65ef6bb55b8b) Signed-off-by: Michael Niedermayer <[email protected]>
* doc/APIchanges: Fix typos in hashesMichael Niedermayer2018-04-201-2/+2
| | | | | | | | Thanks-to: Moritz Barsnick <[email protected]> for finding the correct ones Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit ec8a5262b03f85158d722dbc8b8f30cb6bd67e0f) Signed-off-by: Michael Niedermayer <[email protected]>
* avcodec/mediacodecdec_common: make stride and slice-height non-mandatory fieldsMatthieu Bouron2018-04-191-2/+2
| | | | | | | Fixes decoding on the Samsung Chromebook Pro which do not set the codec output format stride and slice-height fields. (cherry picked from commit 67d0911f27e29d551865dbca3af5c49abe029885)
* avformat/tls_schannel: fix handling of EOF after avio changesHendrik Leppkes2018-04-191-4/+6
| | | | (cherry picked from commit 5c6365af454fb24f20d753ed99dd8e2b60e85035)
* configure: fix clang-cl check in the MSVC sectionHendrik Leppkes2018-04-191-1/+1
| | | | | | Without properly grouping the checks, the second test would execute for MSVC cl.exe, which results in configure getting stuck since cl.exe -? is an interactive paginated help screen, waiting for input.
* avdevice/iec61883: free the private context at the endJames Almer2018-04-181-0/+1
| | | | | | | Fixes part of ticket #7146. Signed-off-by: James Almer <[email protected]> (cherry picked from commit 5079e96bcc7aaa9cae82a58397ce986e124028e4)
* avdevice/iec61883: return reference counted packetsJames Almer2018-04-181-4/+13
| | | | | | | | Fixes part of ticket #7146, dealing with leaks of packet data since commit 87c88122703f2befcf96383d05bdf14373c22df9. Signed-off-by: James Almer <[email protected]> (cherry picked from commit b8629654c6460a28c507f816a977914e3a6f2520)
* avformat/movenc: support writing iTunes cover imageTimo Teräs2018-04-172-5/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://trac.ffmpeg.org/ticket/2798 This makes movenc handle AV_DISPOSITION_ATTACHED_PIC and write the associated pictures in iTunes cover atom. This corresponds to how 'mov' demuxer parses and exposes the cover images when reading. Most of the existing track handling loops properly ignore these 'virtual streams' as MOVTrack->entry is never incremented for them. However, additional tests are added as needed to ignore them. Tested to produce valid output with: ffmpeg -i movie.mp4 -i thumb.jpg -disposition:v:1 attached_pic \ -map 0 -map 1 -c copy movie-with-cover.mp4 The cover image is also copied correctly with: ffmpeg -i movie-with-cover.mp4 -map 0 -c copy out.mp4 AtomicParseley says that the attached_pic stream is properly not visible in the main tracks of the file. Signed-off-by: Timo Teräs <[email protected]> (cherry picked from commit 9af71b326fda1c6f32a26d465f7740110113e759)
* ffprobe: report unavailable SAR correctly in stream infoTimo Teräs2018-04-171-1/+1
| | | | | | | | | | av_guess_sample_aspect_ratio() will return undefined or missing value as {0,1}. This fixes show_stream() to check numerator to display 'N/A' when appropriate. show_frame() does this already correctly. Signed-off-by: Timo Teräs <[email protected]> (cherry picked from commit c663dce031b3973e37c83ae1818f1484e1cf482c)
* configure: add nvcc to CMDLINE_SETTimo Rothenpieler2018-04-161-0/+1
| | | | This was somehow forgotten and nobody noticed until now.
* avformat/flacenc: add flac_init()James Almer2018-04-161-10/+20
| | | | | Signed-off-by: James Almer <[email protected]> (cherry picked from commit 6838359448faeceb4830e7a1cf3ca6e36fb7e4a7)
* avformat/flacenc: support writing attached picturesRodger Combs2018-04-161-36/+242
| | | | | | | Usage of packet queueing API and some cleaning done by the committer. Signed-off-by: James Almer <[email protected]> (cherry picked from commit 00d8598eba2e8dce31af250d6ecaec37254475aa)
* avformat/movenc: forbid muxing AV1 streams until the spec is finishedJames Almer2018-04-161-0/+4
| | | | | | | | This prevents creating potentially broken files, as both the AV1 and the AV1 in ISOMBFF specs are unfinished. Signed-off-by: James Almer <[email protected]> (cherry picked from commit 62bdbb5ce0c54b9f73c9b2580467ab1e6d76b70b)
* configure: extend the check for bcryptJames Almer2018-04-161-1/+2
| | | | | | | | Some old mingw-w64 builds seem to provide an incomplete implementation of the API. Add an extra check to make sure it's disabled for those. Signed-off-by: James Almer <[email protected]> (cherry picked from commit c04609eefce0183d460430f5014f7f8948170770)
* Update bunch of versions to 4.0Michael Niedermayer2018-04-162-2/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* add release notes based on release 3.4Michael Niedermayer2018-04-161-0/+15
| | | | | | | Name suggestion was from Kieran (cherry picked from commit b1ec41a64f2def0ce7d5b2b35d9ef478a4a35d26) Signed-off-by: Michael Niedermayer <[email protected]>
* Bump minor versions for branching release/4.0Michael Niedermayer2018-04-168-11/+11
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* doc/APIchanges: Add 4.0 cut pointMichael Niedermayer2018-04-161-0/+2
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* doc/APIchanges: Fill in missing stuffMichael Niedermayer2018-04-161-33/+33
| | | | Signed-off-by: Michael Niedermayer <[email protected]>
* avfilter/showvolume : cosmetic move bracket after func declaration to a new lineMartin Vignali2018-04-161-1/+2
|
* avfilter/showvolume : add persistent max displayMartin Vignali2018-04-162-0/+62
| | | | draw a color line for the max level in the given duration
* avfilter/showvolume : add display scale optionMartin Vignali2018-04-162-3/+29
| | | | linear (current behaviour) or log display (more close to classic audio meter)
* avfilter/af_headphone: fix type=time with hrir=multichPaul B Mahol2018-04-161-2/+2
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avformat/hlsenc: avformat/hlsenc: add error message for encrypt fmp4 modeSteven Liu2018-04-161-1/+6
| | | | | | | and refine the warning message when use both hls_key_info_file and hls_enc Reviewed-by: Gyan Doshi <[email protected]> Signed-off-by: Steven Liu <[email protected]>
* amfenc: Remove spurious initialisationsMark Thompson2018-04-151-47/+29
| | | | Also minor cosmetics.
* amfenc: Add DXVA2 hardware frame input supportAlexander Kravchenko2018-04-151-0/+79
| | | | | | | Adds support for AMF initialisation from a DXVA2 (Direct3D9) device, and then allows passing DXVA2 surfaces into an AMF encoder. Signed-off-by: Mark Thompson <[email protected]>
* amfenc: Ensure that the software format of hardware frames is validAlexander Kravchenko2018-04-151-3/+9
| | | | Signed-off-by: Mark Thompson <[email protected]>
* amfenc: Do not automatically download/upload unknown hardware input framesMark Thompson2018-04-151-53/+35
| | | | | | | | Supplying a hardware input frame which is not in the input hardware frames context is not allowed by the API, so additional code to handle it is not necessary. Further, handling it automatically results in very low performance - it is more appropriate to fail immediately so that the user can fix their incorrect setup.
* amfenc: Fail to open if the user-supplied device is not usableMark Thompson2018-04-151-49/+81
| | | | | | | | If the user supplies a device or frames context then it is an error not to use it; this is consistent with other hardware components. Also factorise out the D3D11 initialisation and improve error messages.
* configure: fix clang-cl detectionAlexander Bilyak2018-04-151-2/+2
| | | | | | | | | When using clang-cl it expects parameters passed in MSVC-style, so appropriate toolchain should be selected. As soon as both clang and clang-cl report themselfs as "clang" with -v option the only chance to detect clang-cl is passing -? option to both which is valid for clang-cl.exe and not for clang.exe. Reviewed-by: Dale Curtis <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* avfilter/af_headphone: add single hrir multichannel stream modePaul B Mahol2018-04-152-54/+150
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avcodec/nvdec: correctly set intra_pic_flag for h264/hevcTimo Rothenpieler2018-04-152-2/+8
|
* avcodec/aac_ac3_parser: account for data already in the parsing bufferHendrik Leppkes2018-04-151-0/+3
| | | | | | | | | | | If a frame starts very close to a packet boundary, the start code may already have been added to the parsing buffer, indicated by a small negative value of "i", while the header is still being tracked in the "state" variable. Reduce the remaining size accordingly, otherwise trying to find the next frame could skip over the frame header and lump two frames together as one.
* avcodec/dxv: add support for "high" quality modePaul B Mahol2018-04-151-35/+780
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avutil/random_seed: use bcrypt instead of the old wincrypt APISteve Lhomme2018-04-142-12/+13
| | | | | | | | Remove the wincrypt API calls since we don't support XP anymore and bcrypt is available since Vista, even on Windows Store builds. Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: James Almer <[email protected]>
* avfilter/af_headphone: fix memory leak and overreadPaul B Mahol2018-04-141-3/+7
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avfilter/af_headphone: do not output invalid samples when flushingPaul B Mahol2018-04-141-4/+12
| | | | Signed-off-by: Paul B Mahol <[email protected]>
* avfilter/af_headphone: fix flushingPaul B Mahol2018-04-141-1/+14
| | | | Signed-off-by: Paul B Mahol <[email protected]>