summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'f25609ff06b093d82548c92fc2031cd2e66c20d3'James Almer2017-10-30
|\ | | | | | | | | | | | | * commit 'f25609ff06b093d82548c92fc2031cd2e66c20d3': doc/examples/filter_audio: const correctness Merged-by: James Almer <jamrial@gmail.com>
| * doc/examples/filter_audio: const correctnessDiego Biurrun2017-04-24
| | | | | | | | doc/examples/filter_audio.c:168:17: warning: assignment discards ‘const’ qualifier from pointer target type
* | Merge commit '0fd0d4fd0a518e30ff23972828ad7cf7f35cfb9d'James Almer2017-10-30
|\| | | | | | | | | | | | | * commit '0fd0d4fd0a518e30ff23972828ad7cf7f35cfb9d': swscale-test: const correctness Merged-by: James Almer <jamrial@gmail.com>
| * swscale-test: const correctnessDiego Biurrun2017-04-24
| |
* | avdevice/libndi_newtek_dec: remove extra bracketJames Almer2017-10-30
| | | | | | | | | | | | Fixes compilation broken in 2245476e5c451552f8f32a4a881f6b4968898a47 Signed-off-by: James Almer <jamrial@gmail.com>
* | avdevice/decklink_dec: remove extra bracketJames Almer2017-10-30
| | | | | | | | | | | | | | | | Fixes compilation broken in 2245476e5c451552f8f32a4a881f6b4968898a47 Fixes ticket #6791 Signed-off-by: James Almer <jamrial@gmail.com>
* | x86/bswapdsp: add missing preprocessor wrappers for AVX2 functionsJames Almer2017-10-29
| | | | | | | | | | | | Fixes build with old nasm/yasm. Signed-off-by: James Almer <jamrial@gmail.com>
* | decode: avoid leaks on failure in ff_get_buffer()Anton Khirnov2017-10-29
| | | | | | | | | | | | | | | | | | If the get_buffer() call fails, the frame might have some side data already set. Make sure it gets freed. Merges Libav commit de77671438c24ffea93398c8dc885d4dd04477de. Signed-off-by: James Almer <jamrial@gmail.com>
* | lavc/avrndec: remove AV_CODEC_CAP_DR1, as it's brokenwm42017-10-29
| | | | | | | | | | | | | | In the is_mjpeg case, the user's get_buffer2 callback is not called, thus completely breaking the API. Signed-off-by: James Almer <jamrial@gmail.com>
* | libavformat/mov.c: use calculated dts offset when seeking in streamsJonas Licht2017-10-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subtract the calculated dts offset from the requested timestamp before seeking. This fixes an error "Error while filtering: Operation not permitted" observed with a short file which contains only one key frame and starts with negative timestamps. Then, av_index_search_timestamp() returns a valid negative timestamp, but mov_seek_stream bails out with AVERROR_INVALIDDATA. Fixes ticket #6139. Signed-off-by: Jonas Licht <jonas.licht@fem.tu-ilmenau.de> Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | movenc: add m4b to ipod format extensionsLukas Stabe2017-10-30
| | | | | | | | | | | | | | | | m4b is commonly used as extension for m4a audiobook files. The format is exactly the same. The only thing that differs is the extension. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | fate: Add bitexact flag to the invalid-elst test.Carl Eugen Hoyos2017-10-29
| | | | | | | | Fixes fate-mov-invalid-elst-entry-count on a ppc system.
* | fate: Fix some of the fitsdec tests on big-endian.Carl Eugen Hoyos2017-10-29
| |
* | avdevice: remove usage of deprecated setter and getter functionsJames Almer2017-10-29
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ffmpeg: remove usage of deprecated getter functionsJames Almer2017-10-29
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ffprobe: remove usage of deprecated getter functionsJames Almer2017-10-29
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | lavf/aviobuf: return EINVAL when reading from a write-only context.Nicolas George2017-10-29
| | | | | | | | Signed-off-by: Nicolas George <george@nsup.org>
* | lavf/avio: temporarily accept 0 as EOF.Nicolas George2017-10-29
| | | | | | | | | | | | | | | | Print a warning to let applicatios fix their use. After a deprecation period, check with a low-level assert. Also make the constraint explicit in the doxygen comment. Signed-off-by: Nicolas George <george@nsup.org>
* | examples/avio_reading: return AVERROR_EOF at EOF.Nicolas George2017-10-29
| | | | | | | | Signed-off-by: Nicolas George <george@nsup.org>
* | avcodec/jpeglsdec: Check for end of bitstream in ls_decode_line()Michael Niedermayer2017-10-29
| | | | | | | | | | | | | | | | | | 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>
* | avcodec/jpeglsdec: Check ilv for being a supported valueMichael Niedermayer2017-10-29
| | | | | | | | | | | | | | 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>
* | dashenc: copy stream frame rate to output streamPeter Große2017-10-29
| | | | | | | | | | | | | | | | Leads to setting of DefaultDuration in Matroska muxer based on frame rate instead of timebase. Fixes playback in Chrome. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: Don't output frameRates at both AS and Representation-level. Only ↵Anton Schubert2017-10-29
| | | | | | | | | | | | | | | | | | | | | | | | output maxFrameRate at AS-level. Fix conformance regarding section "3.2.4. Presence of Attributes and Element" of the "Guidelines for Implementation: DASH-IF Interoperability Points V4.1" (http://dashif.org/guidelines/) Signed-off-by: Anton Schubert <ischluff@mailbox.org> Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: allow AdaptationSets to have different average frame ratesPeter Große2017-10-29
| | | | | | | | | | Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: don't write header data before the first packet arrivesPeter Große2017-10-29
| | | | | | | | | | | | Fixes: 1b8ef01f04ab ("dashenc: add webm support") Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: set DASH related options for the subsequent matroska muxer when ↵Peter Große2017-10-29
| | | | | | | | | | | | | | | | | | | | using webm This patch is inspired by the ffmpeg webm_chunk muxer and fixes that all resulting tracks have the same track number. Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dashenc: fix bitrate estimation with correct scalingAnton Schubert2017-10-29
| | | | | | | | | | | | Signed-off-by: Anton Schubert <ischluff@mailbox.org> Signed-off-by: Peter Große <pegro@friiks.de> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/rtpenc: Add support for 24 bit pcm encoding as defined by RFC 3190.Carl Eugen Hoyos2017-10-29
| | | | | | | | Fixes ticket #6770.
* | libavcodec/bswapdsp : add AVX2 func for bswap_buf (swap uint32_t)Martin Vignali2017-10-29
| |
* | lsws/yuv2rgb: Fix yuva2rgb32 on big endian hardware.Carl Eugen Hoyos2017-10-29
| |
* | avformat/avformat.h: fix pairs typoJames Almer2017-10-29
| | | | | | | | | | Found-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: deprecate getters and setters for AVFormatContext and AVStream fieldsJames Almer2017-10-29
| | | | | | | | | | | | | | The fields can be accessed directly, so these are not needed anymore. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avformat: move public AVStream fields up in the structJames Almer2017-10-29
| | | | | | | | | | | | | | Remove the silly second notice. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avutil/frame: deprecate getters and setters for AVFrame fieldsJames Almer2017-10-29
| | | | | | | | | | | | | | The fields can be accessed directly, so these are not needed anymore. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/magicyuvenc: improve compressionPaul B Mahol2017-10-29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | libavcodec/magicyuv : remove unneed variable assignmentMartin Vignali2017-10-29
| |
* | avformat/hlsenc: reindent hlsenc codeSteven Liu2017-10-29
| | | | | | | | Signed-off-by: Steven Liu <lq@onvideo.cn>
* | avformat/hlsenc: fix missing first segment bug in fmp4 modeSteven Liu2017-10-29
| | | | | | | | | | | | | | fix ticket id: #6776 fix code logic error, need not check first segment. Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | avformat/hlsenc: fix base_output_dirname is null when basename_size is 0 bugSteven Liu2017-10-29
| | | | | | | | | | | | | | fix ticket id: #6777 when use argument hls_segment_filename, the basename_size will be 0 Signed-off-by: Steven Liu <lq@onvideo.cn>
* | avformat: remove use of deprecated AVFMT_FLAG_KEEP_SIDE_DATA flagJames Almer2017-10-29
| | | | | | | | | | | | | | It has no effect whatsoever since the major bump. Replace the flag's documentation to reflect this as well. Signed-off-by: James Almer <jamrial@gmail.com>
* | lavfi/palettegen: Fix compilation after 1da8c4e.Carl Eugen Hoyos2017-10-29
| | | | | | | | Found-by: James Almer
* | lavfi/palettegen: Allow setting the background colour.Carl Eugen Hoyos2017-10-29
| |
* | Merge commit '8fd8f91e47f33cd82371a97ac81afc476144964f'James Almer2017-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '8fd8f91e47f33cd82371a97ac81afc476144964f': qsvenc: Make sure the interlaced encoding works qsvenc: Use MFXVideoENCODE_Query() to update the parameters This commit is a noop, see dd8319767e1674d030b5d803c43029e67db5efb8 ae5b67ee64bec00c52881ff8426fddaf477341c1 Merged-by: James Almer <jamrial@gmail.com>
| * qsvenc: Make sure the interlaced encoding worksAaron Levinson2017-04-23
| | | | | | | | | | | | | | And reduce the vertical alignment constraint when possible to reduce the memory usage. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * qsvenc: Use MFXVideoENCODE_Query() to update the parametersAaron Levinson2017-04-23
| | | | | | | | | | | | | | | | Fill out the default/unset parameters with ones actually in use. Matches the current MediaSDK example code. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba'James Almer2017-10-28
|\| | | | | | | | | | | | | * commit 'e00db9f78bb475ed5103364f61892f4e75ef89ba': checkasm: hevc: Add a hevc_ prefix to the add_residual functions Merged-by: James Almer <jamrial@gmail.com>
| * checkasm: hevc: Add a hevc_ prefix to the add_residual functionsMartin Storsjö2017-04-21
| | | | | | | | | | | | | | This makes it easier to group them with the rest when running e.g. --bench=hevc. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '1731c3530bffb876deb9e00dfffdf9841a8412cd'James Almer2017-10-28
|\| | | | | | | | | | | | | | | | | | | * commit '1731c3530bffb876deb9e00dfffdf9841a8412cd': mm: Skip unexpected audio packets This commit is a noop. The generic code already drops packets from non-existant streams. Merged-by: James Almer <jamrial@gmail.com>
| * mm: Skip unexpected audio packetsLuca Barbato2017-04-20
| | | | | | | | | | Bug-Id: 1046 CC: libav-stable@libav.org
* | Merge commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336'James Almer2017-10-28
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2c469b73f8ac3dd6a98d38281f61b68ea6dd336': mjpeg: Report non-3 component rgb lossless as not supported [15:56:27] <jamrial> michaelni: can't reproduce the failure f2c469b73f is trying to "fix" [15:56:30] <jamrial> do we support what that commit claims is unsupported? [16:56:54] <michaelni> jamrial, yes, we support lossless rgba This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>