Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-16Merge commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c'Clément Bœsch
* commit '4fef648d10bf3bcfd4b8fa5755c1128966a2427c': Remove the legacy X11 screen grabber Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15Merge commit '8495d84f0101464b15517860db33e8605586d87e'Clément Bœsch
* commit '8495d84f0101464b15517860db33e8605586d87e': ac3dec: Add some inline hints Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15Merge commit '3db51bf671defd47f2ec5ab67b11fb7730fb5e5a'Clément Bœsch
* commit '3db51bf671defd47f2ec5ab67b11fb7730fb5e5a': ac3dec: Simplify skipping Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15Merge commit 'f0ccc65bc9ab9ddf1366066395564c71bcc825ee'Clément Bœsch
* commit 'f0ccc65bc9ab9ddf1366066395564c71bcc825ee': ac3dec: Split coupling-specific code from decode_audio_block() Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15Merge commit 'a5ebe5d1217942238c641c83b24ef1106e53934a'Clément Bœsch
* commit 'a5ebe5d1217942238c641c83b24ef1106e53934a': ac3dec: Split spx-specific code from decode_audio_block() Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15Merge commit '2ac00d2d1d51047c6ce69d5fbe1a08392d142658'Clément Bœsch
* commit '2ac00d2d1d51047c6ce69d5fbe1a08392d142658': mov: Validate the ID number This commit is a noop as the modified check is not present in FFmpeg. See d30870cc730337b7017cc194d696f68ee48f7f1d. Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15Merge commit 'a115eb9e750543f1d8bf951414d291069bf396c2'Clément Bœsch
* commit 'a115eb9e750543f1d8bf951414d291069bf396c2': mimic: do not release the newly obsolete reference at the end of decoding Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15Merge commit 'ae90119c6701fa09ff747cca35238e36b2d2ab2f'Clément Bœsch
* commit 'ae90119c6701fa09ff747cca35238e36b2d2ab2f': configure: Simplify license incompatibility check An extra GPLV3 list is added for libsmbclient as having it in both GPL and VERSION3 lists would cause a duplicate in the final config list. Also, for consistency, libnpp is treated the same as the other nonfree component (libfdk_aac and openssl). Merged-by: Clément Bœsch <u@pkh.me>
2017-03-15avcodec/videotoolboxenc: add rc_max_bitrate control into videotoolboxSteven Liu
add kVTCompressionPropertyKey_DataRateLimits support by rc_max_bitrate Reviewed-by: Rick Kern <kernrj@gmail.com> Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-03-15Merge commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195'Clément Bœsch
* commit 'e46a6fb7732a7caef97a916a4f765ec0f779d195': avconv: Check that muxing_queue exists before reading from it Mostly noop. This was fixed in FFmpeg in 7f7c494a3. The merge makes the cosmetics match but does not include the weird av_log(). Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15Merge commit '100fb0ddfda958da70f98feac81f924c02483789'Clément Bœsch
* commit '100fb0ddfda958da70f98feac81f924c02483789': configure: Allow detecting and using LLVM lld-link as linker for windows Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15Merge commit '79fb0692992c74214c6cf8e81350fc93eeffc5ec'Clément Bœsch
* commit '79fb0692992c74214c6cf8e81350fc93eeffc5ec': configure: Move defines for controlling MSVCRT headers to the CRT detection section Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15Merge commit '56af0bc10f49654b5b5f3efe82c69a13bf15fc8b'Clément Bœsch
* commit '56af0bc10f49654b5b5f3efe82c69a13bf15fc8b': configure: Check for strtoll and redirect to _strtoi64 in the msvcrt block Also includes _strtoui64 in the check. Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15Merge commit '48b80f8393d418ad35d73f5a36f5011de1928f3c'Clément Bœsch
* commit '48b80f8393d418ad35d73f5a36f5011de1928f3c': hpeldsp: Explain why put_no_rnd_pixels_tab is larger than necessary Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15Merge commit '40ad05bab206c932a32171d45581080c914b06ec'Clément Bœsch
* commit '40ad05bab206c932a32171d45581080c914b06ec': checkasm: Cast unsigned to signed Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15Merge commit 'b183abfb5b6366b177cf44f244c66156257a6fd6'Clément Bœsch
* commit 'b183abfb5b6366b177cf44f244c66156257a6fd6': vpx: Support color range Decoder chunk not merged as the framework automatically copies avctx color range to the frame color range. And we already set the avctx field since cbcc88c039. Merged-by: Clément Bœsch <cboesch@gopro.com>
2017-03-15lavc/h264dec: use OFFSET macroMatthieu Bouron
2017-03-15avformat/hlsenc: fix duration wrong when no pkt durationSteven Liu
when cannot get pkt duration, hlsenc segments duration will be set to 0, this patch can fix it. Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-03-15ffmpeg, ffprobe: don't "merge" side data into packet data by defaultwm4
Preparation for potentially disabling merged side data by default in the libs. Do this in particular because it affects fate tests. The changed tests either reflect added packet side data, or the changed packet size due to merged side data removal reducing the packet size.
2017-03-15lavf/avio: Be more explicit in logging white/black list matchesAlexander Strasser
The current form of the messages indicating matches in the white or black lists seems to be a bit too much relying on context. Make the messages more explicit. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2017-03-15lavf/avio: Remove unnecessary escaping of ' in string literalsAlexander Strasser
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
2017-03-15avcodec/mpegaudiodec_template: Make l3_unscale() work with e=0Michael Niedermayer
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>
2017-03-15avcodec/tiff: Check for multiple geo key directoriesMichael Niedermayer
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>
2017-03-15avcodec/pictordec: Fix runtime error: left shift of 805306368 by 2 places ↵Michael Niedermayer
cannot be represented in type 'int' Fixes: 823/clusterfuzz-testcase-6727060074528768 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-15doc/filters: Add colourspace values for colormatrix filterKatherine Nagels
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Kieran Kunhya <kierank@obe.tv>
2017-03-14avformat/flvenc: flx flvflags no_metadata bugSteven Liu
When use flvflags no_metadata , the FLV header will be cover by write tailer This commit fix the bug Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-03-14avformat/hlsenc: fix ticket 6231Steven Liu
check if the hls_flags is byterange_mode and check if should close fd Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-03-14avcodec/wavpack: Fix runtime error: shift exponent 32 is too large for ↵Michael Niedermayer
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>
2017-03-14avcodec/targa: Skip hflip on blank imagesMichael Niedermayer
Fixes: timeout with 810/clusterfuzz-testcase-5249282825256960 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-14avcodec/wavpack: Fix runtime error: shift exponent 137 is too large for ↵Michael Niedermayer
32-bit type 'int' Fixes: 808/clusterfuzz-testcase-4715513349406720 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-03-14avcodec/h264_direct: Fix runtime error: signed integer overflow: 2147483647 ↵Michael Niedermayer
- -14133 cannot be represented in type 'int' Fixes: 755/clusterfuzz-testcase-5369072516595712 See: [FFmpeg-devel] [PATCH 1/2] avcodec/h264_direct: Fix runtime error: signed integer overflow: 2147483647 - -14133 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>
2017-03-13avcodec/xpmdec: there are XPM files with dos line endingsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-13avfilter/vf_lut3d: actually skip lines when encountering DOMAIN_ stringPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-13avformat/hlsenc: second_levels flags process function extractSteven Liu
the SECOND_LEVEL* flags process and name is too long extract all of them output to funtions, make code clear Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
2017-03-13avcodec/vp6: clear dimensions on failed resolution change in vp6_parse_header()Michael Niedermayer
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>
2017-03-13avcodec/rv34: Fix runtime error: signed integer overflow: 36880 * 66288 ↵Michael Niedermayer
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>
2017-03-13avcodec/mpeg12dec: Fix runtime error: left shift of negative value -1Michael Niedermayer
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>
2017-03-13avcodec/xpmdec: avoid "magic" numbers in function hex_char_to_number()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-13avcodec/xpmdec: fix colors values which are different for X11Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-13avcodec/xpmdec: do not allow number of colors to be higher than allocatedPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-13avcodec/xpmdec: rename yet another functionPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-13avcodec/xpmdec: rename convert to hex_char_to_numberPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-13avcodec/xpmdec: improve comment for one function and also fix 2 identation ↵Paul B Mahol
issues Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-12swresample/swresample: do not reset tsf on swr_alloc_set_optsMuhammad Faiz
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>
2017-03-12vf_hwupload: Add missing return value checkJun Zhao
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>
2017-03-12tests/api-seek: fix memory leak on realloc() failureJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-12test/api-seek: clean up properly on failureJames Almer
Also propagate better error values. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-12tests/api-seek: make the crc array uint32_tJames Almer
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: James Almer <jamrial@gmail.com>
2017-03-12avcodec/xpmdec: skip everything before signaturePaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2017-03-12avcodec/codec_desc: add mime type for X-BitMapPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 16:35:45 +0300