summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avcodec/xpmdec: fix colors values which are different for X11Paul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/xpmdec: do not allow number of colors to be higher than allocatedPaul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/xpmdec: rename yet another functionPaul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/xpmdec: rename convert to hex_char_to_numberPaul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/xpmdec: improve comment for one function and also fix 2 identation ↵Paul B Mahol2017-03-12
| | | | | | issues Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swresample/swresample: do not reset tsf on swr_alloc_set_optsMuhammad Faiz2017-03-13
| | | | | | | | | | | | so tsf option in aresample will have effect previously tsf/internal_sample_format had no effect fate is updated s32p previously used fltp internally dblp previously used fltp/dblp internally Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* vf_hwupload: Add missing return value checkJun Zhao2017-03-12
| | | | | | | | | | | Add missing return value checks to suppress build warning and remove noop ff_formats_unref() calling. Note: most filters using ff_formats_ref() didn't have a suitable error handling, it's a potential memory leak issue. Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
* tests/api-seek: fix memory leak on realloc() failureJames Almer2017-03-12
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* test/api-seek: clean up properly on failureJames Almer2017-03-12
| | | | | | | Also propagate better error values. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* tests/api-seek: make the crc array uint32_tJames Almer2017-03-12
| | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/xpmdec: skip everything before signaturePaul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/codec_desc: add mime type for X-BitMapPaul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/codec_desc: add mime type for X-PixMapPaul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/xpmdec: make convert function more picky about its inputPaul B Mahol2017-03-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec: add XPM decoder and demuxerParas Chadha2017-03-12
| | | | Signed-off-by: Paras Chadha <paraschadha18@gmail.com>
* Merge commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417'Mark Thompson2017-03-12
|\ | | | | | | | | | | | | | | | | * commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417': lavfi: add a QSV deinterlacing filter Minor fixup for lavfi differences. Merged-by: Mark Thompson <sw@jkqxz.net>
| * lavfi: add a QSV deinterlacing filterAnton Khirnov2016-07-22
| |
* | Merge commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4'Mark Thompson2017-03-12
|\| | | | | | | | | | | | | * commit '8e07c22e508b349d145b9f142aa3ee8b3ce1d3a4': qsvenc: print warnings from encode/init Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsvenc: print warnings from encode/initAnton Khirnov2016-07-22
| |
* | Merge commit '0956fd460681e8ccbdae19f135f0d3970bf95c2f'Mark Thompson2017-03-12
|\| | | | | | | | | | | | | | | | | * commit '0956fd460681e8ccbdae19f135f0d3970bf95c2f': qsvenc: do not re-execute encoding on all positive status codes Noop, see fb240a6276fa36fe120aadd67b4ca774e354f22b. Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsvenc: do not re-execute encoding on all positive status codesAnton Khirnov2016-07-22
| | | | | | | | It should only be done for DEVICE_BUSY/IN_EXECUTION
* | Merge commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49'Mark Thompson2017-03-12
|\| | | | | | | | | | | | | * commit '95414eb2dc63a6f934275b4ed33dedd4369f2c49': qsv: print more complete error messages Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv: print more complete error messagesAnton Khirnov2016-07-22
| | | | | | | | Include the libmfx error code and its description
* | Merge commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b'Mark Thompson2017-03-12
|\| | | | | | | | | | | | | * commit 'd9ec3c60143babe1bb77c268e1d5547d15acd69b': qsvenc: take only the allocated dimensions from the frames context Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsvenc: take only the allocated dimensions from the frames contextAnton Khirnov2016-07-22
| | | | | | | | | | Other parameters, like the display size, should still be taken from the codec context.
* | Merge commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2'Mark Thompson2017-03-12
|\| | | | | | | | | | | | | * commit '37a9015ee84c15fec5247ba8f6577351a25fa8d2': qsvenc: add support for p010 Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsvenc: add support for p010Anton Khirnov2016-07-22
| |
* | lavfi: add a QSV scaling filterAnton Khirnov2017-03-12
| | | | | | | | | | | | | | | | This merges libav commit ac7bfd69678f3966e38debdb27f4bde94dc0345c, which was previously skipped. (cherry picked from commit ac7bfd69678f3966e38debdb27f4bde94dc0345c) Signed-off-by: Mark Thompson <sw@jkqxz.net>
* | Merge commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d'Mark Thompson2017-03-12
|\| | | | | | | | | | | | | * commit '21962261c74aed4df00ae8348a5e2d1ecb67c52d': qsv: handle the semi-packed formats in map_fourcc as well Merged-by: Mark Thompson <sw@jkqxz.net>
| * qsv: handle the semi-packed formats in map_fourcc as wellAnton Khirnov2016-07-22
| | | | | | | | | | This will allow using this function for encoding as well, where the input format is already the semi-packed version.
* | Merge commit 'f65285aba0df7d46298abe0c945dfee05cbc6028'Clément Bœsch2017-03-12
|\| | | | | | | | | | | | | * commit 'f65285aba0df7d46298abe0c945dfee05cbc6028': lavc: set sw_pix_fmt for hwaccel encoding Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: set sw_pix_fmt for hwaccel encodingAnton Khirnov2016-07-22
| |
* | Merge commit 'd59641abfd25a1007bdf4723d952887b1e3619c6'Clément Bœsch2017-03-12
|\| | | | | | | | | | | | | * commit 'd59641abfd25a1007bdf4723d952887b1e3619c6': lavc: initialize AVCodecContext.sw_pix_fmt properly Merged-by: Clément Bœsch <u@pkh.me>
| * lavc: initialize AVCodecContext.sw_pix_fmt properlyAnton Khirnov2016-07-22
| | | | | | | | | | Currently it's memset to 0, which is YUV420P. It should be initialized to none.
* | Merge commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b'Clément Bœsch2017-03-12
|\| | | | | | | | | | | | | | | | | * commit '8b7a9729aa162e2bbd571933f1aa40767f1ff47b': avconv_qsv: use the actual pixel format provided by lavc This commit is a noop, see 03cef34aa66 Merged-by: Clément Bœsch <u@pkh.me>
| * avconv_qsv: use the actual pixel format provided by lavcAnton Khirnov2016-07-22
| | | | | | | | Do not hardcode NV12. This allows 10bit decoding with -hwaccel qsv.
* | Merge commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0'Clément Bœsch2017-03-12
|\| | | | | | | | | | | | | | | | | * commit '6f40181cad8ac04adff7bd10e1e1ab65f22bc1f0': avconv_qsv: align the surface size to 32 This commit is a noop, see 03cef34aa66 Merged-by: Clément Bœsch <u@pkh.me>
| * avconv_qsv: align the surface size to 32Anton Khirnov2016-07-22
| | | | | | | | This is required e.g. by HEVC.
* | Merge commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0'Clément Bœsch2017-03-12
|\| | | | | | | | | | | | | * commit 'b0f36a0043d76436cc7ab8ff92ab99c94595d3c0': avconv: stop using setpts for input framerate forced with -r Merged-by: Clément Bœsch <u@pkh.me>
| * avconv: stop using setpts for input framerate forced with -rAnton Khirnov2016-07-22
| | | | | | | | | | The setpts filter does not signal to the rest of the filtergraph that the stream is CFR. Just generate the timestamps manually instead.
* | avcodec/scpr: use correct linesize for prev framePaul B Mahol2017-03-12
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + ↵Michael Niedermayer2017-03-12
| | | | | | | | | | | | | | | | | | | | 6298923 cannot be represented in type 'int' Fixes: 732/clusterfuzz-testcase-4872990070145024 See: [FFmpeg-devel] [PATCH 2/6] avcodec/dca_xll: Fix runtime error: signed integer overflow: 2147286116 + 6298923 cannot be represented in type 'int' Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/amrwbdec: Fix runtime error: left shift of negative value -1Michael Niedermayer2017-03-12
| | | | | | | | | | | | | | 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>
* | avcodec/dca_xll: Fix runtime error: signed integer overflow: 1762028192 + ↵Michael Niedermayer2017-03-12
| | | | | | | | | | | | | | | | | | 698372290 cannot be represented in type 'int' Fixes: 762/clusterfuzz-testcase-5927683747741696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/wavpack: Fix runtime error: signed integer overflow: -2147483648 + ↵Michael Niedermayer2017-03-12
| | | | | | | | | | | | | | | | | | -83886075 cannot be represented in type 'int' Fixes: 761/clusterfuzz-testcase-5442222252097536 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avfilter/af_firequalizer: add av_restrict on convolution funcMuhammad Faiz2017-03-12
| | | | | | | | | | | | | | slightly improved speed Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
* | lavf/dashenc: update bitrates on dash_write_trailerPrzemysław Sobala2017-03-11
| | | | | | | | | | | | | | Provides a way to change bandwidth parameter inside DASH manifest after a non-CBR H.264 encoding. Caller now is able to compute the bitrate by itself, after all packets have been written, and then set that value in AVFormatContext->streams->codecpar->bit_rate before calling av_write_trailer. As a result that value will be set in DASH manifest. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/muxers: move hls_flags temp_file to after SECOND LEVEL hls exampleSteven Liu2017-03-11
| | | | | | | | | | | | the temp_file hls_flags describe text offset is wrong, now move it after example Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* | aarch64: vp9itxfm: Reorder iadst16 coeffsMartin Storsjö2017-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the order they are in the 16 bpp version. There they are in this order, to make sure we access them in the same order they are declared, easing loading only half of the coefficients at a time. This makes the 8 bpp version match the 16 bpp version better. This is cherrypicked from libav commit b8f66c0838b4c645227f23a35b4d54373da4c60a. Signed-off-by: Martin Storsjö <martin@martin.st>
* | arm: vp9itxfm: Reorder iadst16 coeffsMartin Storsjö2017-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This matches the order they are in the 16 bpp version. There they are in this order, to make sure we access them in the same order they are declared, easing loading only half of the coefficients at a time. This makes the 8 bpp version match the 16 bpp version better. This is cherrypicked from libav commit 08074c092d8c97d71c5986e5325e97ffc956119d. Signed-off-by: Martin Storsjö <martin@martin.st>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 16:55:31 +0000