summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976'James Almer2017-04-07
|\ | | | | | | | | | | | | * commit 'e22c63ac74b2968075be8bf0d2deb1ee63b28976': ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy function Merged-by: James Almer <jamrial@gmail.com>
| * ac3enc: Reshuffle some float/fixed-mode ifdefs to avoid a dummy functionDiego Biurrun2016-11-28
| |
* | Merge commit 'd30719e62de68975cbc7ffd318df03a183037563'James Almer2017-04-07
|\| | | | | | | | | | | | | | | | | * commit 'd30719e62de68975cbc7ffd318df03a183037563': hwcontext_vaapi: Don't abort on failing to allocate from a fixed-size pool This commit is a noop, see 2b8151c80690a71db2cf8009855b4ae1a6abdd4c Merged-by: James Almer <jamrial@gmail.com>
| * hwcontext_vaapi: Don't abort on failing to allocate from a fixed-size poolMark Thompson2016-11-26
| |
* | Merge commit '4adbb44ad154cec05e87de60bb827a13c0fe87df'James Almer2017-04-06
|\| | | | | | | | | | | | | * commit '4adbb44ad154cec05e87de60bb827a13c0fe87df': tta: avoid undefined shifts Merged-by: James Almer <jamrial@gmail.com>
| * tta: avoid undefined shiftsAnton Khirnov2016-11-25
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'dc4b62502876c0ebeeba317233cd1348c5b0b2b7'James Almer2017-04-06
|\| | | | | | | | | | | | | | | | | * commit 'dc4b62502876c0ebeeba317233cd1348c5b0b2b7': tta: use get_unary() instead of a custom implementation This commit is a noop, see 58b36959dd095c38ffd181e2b1f647b6df61773c Merged-by: James Almer <jamrial@gmail.com>
| * tta: use get_unary() instead of a custom implementationAnton Khirnov2016-11-25
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'e122b12c88487ac8766ff4eb071856b0666f0134'James Almer2017-04-06
|\| | | | | | | | | | | | | | | | | | | * commit 'e122b12c88487ac8766ff4eb071856b0666f0134': build: Drop gcrypt support This commit is a noop. GCrypt support is exposed in configure as a command line option, and it's independent of GnuTLS. Merged-by: James Almer <jamrial@gmail.com>
| * build: Drop gcrypt supportDiego Biurrun2016-11-25
| | | | | | | | GnuTLS in combination with gcrypt has been deprecated since 2010.
* | avcodec/dvdsubdec: Fixes 2 runtime error: left shift of 170 by 24 places ↵Michael Niedermayer2017-04-07
| | | | | | | | | | | | | | | | | | cannot be represented in type 'int' Fixes: 619/clusterfuzz-testcase-5803914534322176 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/bitpacked: Fix mixed declarations and statementMichael Niedermayer2017-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | ffmpeg: Change duration to int64_tMichael Niedermayer2017-04-07
| | | | | | | | | | | | | | It is assigned from 64bit input in some branches and used with 64bit timestamps This thus fixes a potential integer truncation Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | pthread_frame: don't return stale error codes after flushwm42017-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the following sequence of events: - open a codec without AV_CODEC_CAP_DELAY - decode call fails with an error - ff_thread_flush() is called - drain packet is sent Then the last step would make ff_thread_decode_frame() return an error, because p->result can still be set to an error value. This is because submit_packet returns immediately if AV_CODEC_CAP_DELAY is not set, and no worker thread gets the chance to reset p->result, yet its value is trusted by ff_thread_decode_frame(). Fix this by clearing the error fields on flush.
* | avcodec: fix containts typoJames Almer2017-04-06
| |
* | avformat/dump : Display Content Light Level metadataSteve Lhomme2017-04-06
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | lavc: Add Content Light Level side metadata found in HEVCSteve Lhomme2017-04-06
| | | | | | | | | | | | These data are necessary when transmitting HDR over HDMI. Signed-off-by: James Almer <jamrial@gmail.com>
* | lavu: add support for Content Light Level side metadataSteve Lhomme2017-04-06
| | | | | | | | | | | | As found in HEVC. Signed-off-by: James Almer <jamrial@gmail.com>
* | build fix for mipsShivraj Patil2017-04-06
| | | | | | | | | | Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com> Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | vp8: make mv_min/max thread-local if using partition threading.Ronald S. Bultje2017-04-06
| | | | | | | | | | | | | | | | | | | | | | Fixes tsan warnings like this in fate-vp8-test-vector-007: WARNING: ThreadSanitizer: data race (pid=65909) Write of size 4 at 0x7d8c0000e088 by thread T1: #0 vp8_decode_mb_row_sliced vp8.c:2519 (ffmpeg:x86_64+0x100995ede) [..] Previous write of size 4 at 0x7d8c0000e088 by thread T2: #0 vp8_decode_mb_row_sliced vp8.c:2519 (ffmpeg:x86_64+0x100995ede)
* | vp8: make wait/thread_mb_pos atomic.Ronald S. Bultje2017-04-06
| | | | | | | | | | | | | | | | | | | | | | Fixes tsan warnings like this in fate-vp8-test-vector-007: WARNING: ThreadSanitizer: data race (pid=3590) Write of size 4 at 0x7d8c0000e07c by thread T2: #0 decode_mb_row_no_filter src/libavcodec/vp8.c:2330 (ffmpeg+0x000000ffb59e) [..] Previous write of size 4 at 0x7d8c0000e07c by thread T1: #0 decode_mb_row_no_filter src/libavcodec/vp8.c:2330 (ffmpeg+0x000000ffb59e)
* | x86/idctdsp_init: reindent.Ronald S. Bultje2017-04-06
| |
* | jrev/xvid: hardcode use of C put/add_pixels_clamped.Ronald S. Bultje2017-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the last use of the ff_put/add_pixels_clamped global function pointers, and as such they are removed. This patch has a negative effect on performance on MIPS, since there's a SIMD-optimized put/add_pixels_clamped, but no xvid or jrev. From a code maintenance point of view, that is probably acceptable. Because the global function pointers are removed, this fixes the following tsan warnings when running e.g. fate-dnxhr-parse: WARNING: ThreadSanitizer: data race (pid=29917) Write of size 8 at 0x0000025b12d8 by thread T2 (mutexes: write M1543): #0 ff_idctdsp_init src/libavcodec/idctdsp.c:313 (ffmpeg+0x00000044b68e) [..] Previous write of size 8 at 0x0000025b12d8 by thread T1 (mutexes: write M1541): #0 ff_idctdsp_init src/libavcodec/idctdsp.c:313 (ffmpeg+0x00000044b68e)
* | x86/simple_idct: add explicit sse2 simple_idct_put/add versions.Ronald S. Bultje2017-04-06
| | | | | | | | | | | | These use the mmx IDCT, but sse2 put/add_pixels_clamped implementations. This way we don't need to use the ff_put/add_pixels_clamped function pointers.
* | cavs: add a sse2 idct implementation.Ronald S. Bultje2017-04-06
| | | | | | | | | | This makes using the function pointer ff_add_pixels_clamped() unnecessary, since we always know what the best implementation is at compile-time.
* | cavs: convert idct from inline asm to yasm.Ronald S. Bultje2017-04-06
| |
* | x86/xvididct: remove use of ff_put/add_pixels_clamped function pointer.Ronald S. Bultje2017-04-06
| | | | | | | | | | Since there's separate SSE2 implementations of xvid_idct_put/add, this patch has no practical impact on performance.
* | idct_arm: remove use of ff_put/add_pixels_clamped function pointer.Ronald S. Bultje2017-04-06
| | | | | | | | | | | | | | Instead, hardcode the use of the _arm implementation of add_pixels, and use the C version for put_pixels (as no arm-optimized version exists). Since there's separate implementations of idct{,_put,_add} for neon, this has no practical impact on performance.
* | pthread_frame: allow per-field ThreadFrame owners.Ronald S. Bultje2017-04-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tries to handle cases where separate invocations of decode_frame() (each running in separate threads) write to respective fields in the same AVFrame->data[]. Having per-field owners makes interaction between readers (the referencing thread) and writers (the decoding thread) slightly more optimal if both accesses are field-based, since they will use the respective producer's thread objects (mutex/cond) instead of sharing the thread objects of the first field's producer. In practice, this fixes the following tsan-warning in fate-h264: WARNING: ThreadSanitizer: data race (pid=21615) Read of size 4 at 0x7d640000d9fc by thread T2 (mutexes: write M1006): #0 ff_thread_report_progress pthread_frame.c:569 (ffmpeg:x86_64+0x100f7cf54) [..] Previous write of size 4 at 0x7d640000d9fc by main thread (mutexes: write M1004): #0 update_context_from_user pthread_frame.c:335 (ffmpeg:x86_64+0x100f81abb)
* | libavformat/mov: Fix memory leak, need to free the chapter tracks arrayThierry Foucu2017-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/ftp: Solve a crash bug when network occur a exceptiontiejun.peng@foxmail.com2017-04-05
| | | | | | | | | | | | | | | | | | | | This fixes a proble where ffmpeg would cause crash to do a seek when the network disconnect. The log like this: 01-01 10:53:03.441 6580 6580 F DEBUG : backtrace: 01-01 10:53:03.441 6580 6580 F DEBUG : #00 pc 0002942e /system/lib/libavformat.so (ffurl_write+9) Signed-off-by: tiejun.peng <tiejun.peng@foxmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dvbsubdec: Replace fprintf(stderr) by av_log()Michael Niedermayer2017-04-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | bitpacked: fix potential overflowRostislav Pehlivanov2017-04-05
| | | | | | | | | | | | Fixes: CID1404842 Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | huffyuv: assign correct per-thread avctx pointer to HYuvContext::avctx.Ronald S. Bultje2017-04-05
| | | | | | | | | | | | | | | | | | | | | | Fixes the following tsan warning when running fate-vsynth_lena-ffvhuff: WARNING: ThreadSanitizer: data race (pid=6484) Write of size 8 at 0x7d64000154b8 by main thread (mutexes: write M1331): #0 update_context_from_user src/libavcodec/pthread_frame.c:331 (ffmpeg+0x000000dca887) [..] Previous read of size 8 at 0x7d64000154b8 by thread T2 (mutexes: write M1334): #0 draw_slice src/libavcodec/huffyuvdec.c:857 (ffmpeg+0x000000bcc86f)
* | avfilter/af_loudnorm: do not upsample during second-pass linear normalizationKyle Swanson2017-04-05
| | | | | | | | Signed-off-by: Kyle Swanson <k@ylo.ph>
* | doc/general: fix project name after 2b1a6b1aeClément Bœsch2017-04-05
| |
* | rtp: rfc4175: add handler for YCbCr-4:2:2Damien Riegel2017-04-05
| | | | | | | | | | | | | | | | | | | | | | This adds partial support for the RFC 4175 (raw video over RTP). The only supported formats are the YCbCr-4:2:2 8 bit because it's natively supported by FFmpeg with pixel format UYVY, and 10 bit which requires the vrawdepay codec to convert the payload in a format handled by FFmpeg. Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | codec: bitpacked: add decoderDamien Riegel2017-04-05
| | | | | | | | | | | | | | | | | | | | | | Add a codec capable of decoding some formats of the RFC4175. For now it's only capable of handling YCbCr-4:2:2 with 8-bit or 10-bit depth. For 8-bit it's a simple pass-through, for 10-bit it depacks the stream in the AV_PIX_FMT_YUV422P10 pixel format. Signed-off-by: Damien Riegel <damien.riegel@savoirfairelinux.com> Reviewed-by: Rostislav Pehlivanov <atomnuker@gmail.com>
* | Merge commit 'bf2f748fc74fff5272075e1fe1c07b4152421526'James Almer2017-04-04
|\| | | | | | | | | | | | | * commit 'bf2f748fc74fff5272075e1fe1c07b4152421526': configure: Use correct libm linker flag during math function checks Merged-by: James Almer <jamrial@gmail.com>
| * configure: Use correct libm linker flag during math function checksDiego Biurrun2016-11-25
| |
* | Merge commit 'ce6f780bc6656ad3895f81a988b239ad3c8af4b8'James Almer2017-04-04
|\| | | | | | | | | | | | | * commit 'ce6f780bc6656ad3895f81a988b239ad3c8af4b8': configure: Add missing asyncts filter, movie filter, and output example deps Merged-by: James Almer <jamrial@gmail.com>
| * configure: Add missing asyncts filter, movie filter, and output example depsDiego Biurrun2016-11-25
| | | | | | | | Also add a missing avcodec.h #include in the movie filter.
* | Merge commit '04698d528cac334b6b5cabd3384f01406a766285'James Almer2017-04-04
|\| | | | | | | | | | | | | * commit '04698d528cac334b6b5cabd3384f01406a766285': configure: Use correct variable name in libsnappy test Merged-by: James Almer <jamrial@gmail.com>
| * configure: Use correct variable name in libsnappy testDiego Biurrun2016-11-25
| |
* | Merge commit '30f0d1b997f15d667c05feab0b54f0b2814ba7a9'James Almer2017-04-04
|\| | | | | | | | | | | | | * commit '30f0d1b997f15d667c05feab0b54f0b2814ba7a9': configure: Remove old avisynth support leftover Merged-by: James Almer <jamrial@gmail.com>
| * configure: Remove old avisynth support leftoverDiego Biurrun2016-11-25
| |
* | Merge commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f'James Almer2017-04-04
|\| | | | | | | | | | | | | * commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f': arm: warn/error on movrelx usage problematic with PIC on ELF Merged-by: James Almer <jamrial@gmail.com>
| * arm: warn/error on movrelx usage problematic with PIC on ELFJanne Grunau2016-11-24
| | | | | | | | | | | | The warning has false positives but our asm does not trigger it. For new code false positives can only be avoided by changing the register allocation.
* | Merge commit '5bcc6f76f180d0f88269018727c92fc562fb8abb'James Almer2017-04-04
|\| | | | | | | | | | | | | * commit '5bcc6f76f180d0f88269018727c92fc562fb8abb': configure: Disable warning C4703 with MSVC Merged-by: James Almer <jamrial@gmail.com>
| * configure: Disable warning C4703 with MSVCDiego Biurrun2016-11-24
| | | | | | | | | | This disables warnings about potentially uninitialized local pointer variables. Disabling the warning is in line with what we do for gcc.