summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix visual glitch with XvMC, caused by wrong idct permutation.Ivan Kalvachev2017-10-12
| | | | | | | | | | | | | | | In the past XvMC forced simple_idct since it was using FF_IDCT_PERM_NONE. However now we have SIMD variants of simple_idct that are using FF_IDCT_PERM_TRANSPOSE and if they are selected XvMC would get coefficients in the wrong order. The patch creates new FF_IDCT_NONE that is used only for this kind of hardware decoding and that fallbacks to the old C only simple idct. Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* ffmpeg.c: Fallback to duration_dts, when duration_pts can't be determined.Sasi Inguva2017-10-12
| | | | | | | | This is required for FLV files, for which duration_pts comes out to be zero. Signed-off-by: Sasi Inguva <isasi@google.com> Reviewed-by: Thomas Mundt <tmundt75@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8'James Almer2017-10-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'aba5b94859ef1cb8f517dc64bce86a3021316ae8': Add Apple Pixlet decoder libavutil: add av_mod_uintp2 intmath: add faster clz support This commit is a noop, see 0dd8a3d71e2c01d42e868d6c6b8974fadfcc529e d13e521cc861e791545dd6022fbf93f821e33618 73651090ca1183f37753ee30a7e206ca4fb9f4f0 Merged-by: James Almer <jamrial@gmail.com>
| * Add Apple Pixlet decoderPaul B Mahol2017-03-01
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * libavutil: add av_mod_uintp2James Almer2017-03-01
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
| * intmath: add faster clz supportGanesh Ajjanagadde2017-03-01
| |
* | fate: add missing closing bracketJames Almer2017-10-11
| | | | | | | | | | | | Regression since 85e2fe6281834ac7f16a12a332d9de4b2ec3cd29 Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870'James Almer2017-10-11
|\| | | | | | | | | | | | | | | | | * commit '5ff3b5cafcc685b6936d16602b0f80aa09a95870': build: Add pthreads to list of avutil extralibs This commit is a noop, see 6dfcbd80ad446ff163b47f2bf432bbf706436ea8 Merged-by: James Almer <jamrial@gmail.com>
| * build: Add pthreads to list of avutil extralibsDiego Biurrun2017-03-01
| | | | | | | | libavutil uses pthreads in the buffer code (abstracted through a header).
* | Merge commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e'James Almer2017-10-11
|\| | | | | | | | | | | | | * commit 'db869f4ea4405fb8f9736e5ecdca70f77621a28e': fate: Add build-only targets to FATE Merged-by: James Almer <jamrial@gmail.com>
| * fate: Add build-only targets to FATEDiego Biurrun2017-03-01
| |
* | Merge commit '3c0efbd03349ae68d3a25a082222652a102e3fd4'James Almer2017-10-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3c0efbd03349ae68d3a25a082222652a102e3fd4': build: Allow generating dependencies as a side-effect of assembling build: Generalize yasm/nasm-related variable names This commit is a noop, see fd502f4f5fe8d2f241102ca9a529aa7f88209c22 0cc0c5b6dbf187f9c096de03d999da040197ffe6 Merged-by: James Almer <jamrial@gmail.com>
| * build: Allow generating dependencies as a side-effect of assemblingDiego Biurrun2017-03-01
| |
| * build: Generalize yasm/nasm-related variable namesDiego Biurrun2017-03-01
| | | | | | | | None of them are specific to the YASM assembler.
* | Merge commit 'd1d6230ea3dd2c34bcd121f958706f3177f8d8c5'James Almer2017-10-11
|\| | | | | | | | | | | | | * commit 'd1d6230ea3dd2c34bcd121f958706f3177f8d8c5': build: Add "build" shorthand target that depends on all compile targets Merged-by: James Almer <jamrial@gmail.com>
| * build: Add "build" shorthand target that depends on all compile targetsDiego Biurrun2017-03-01
| |
* | Merge commit '4d1f7e8bc7516e6b7b15f754af4a665b3f8af79e'James Almer2017-10-11
|\| | | | | | | | | | | | | | | | | * commit '4d1f7e8bc7516e6b7b15f754af4a665b3f8af79e': build: Skip generating .version files when cleaning This commit is a noop, see cbe181c8e1611aaee2a85ab522e17b1322bdd4de Merged-by: James Almer <jamrial@gmail.com>
| * build: Skip generating .version files when cleaningDiego Biurrun2017-03-01
| |
* | Merge commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255'James Almer2017-10-11
|\| | | | | | | | | | | | | | | | | | | * commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255': configure: Fix typo in objcc default setting x86: hevc: Add missing colons after assembly labels This commit is a noop. Merged-by: James Almer <jamrial@gmail.com>
| * configure: Fix typo in objcc default settingDiego Biurrun2017-03-01
| | | | | | | | Also drop stray duplicate OBJCC config.mak entry.
| * x86: hevc: Add missing colons after assembly labelsDiego Biurrun2017-03-01
| | | | | | | | | | This fixes several warnings of the sort warning: label alone on a line without a colon might be in error
* | Merge commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63'James Almer2017-10-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '7cb1d9e2dbbe5bf4652be5d78cdd68e956fa3d63': build: Fine-grained link-time dependency settings Also included are bug fix commits 5ff3b5cafcc685b6936d16602b0f80aa09a95870, d9da7151eef7fc469787e7298196cea291acfd82 and 5e27ef800bfa2be17a6353ddedac6b7400e4624f. Merged-by: James Almer <jamrial@gmail.com>
| * build: Fine-grained link-time dependency settingsDiego Biurrun2017-03-01
| | | | | | | | | | | | | | | | | | | | | | | | Previously, all link-time dependencies were added for all libraries, resulting in bogus link-time dependencies since not all dependencies are shared across libraries. Also, in some cases like libavutil, not all dependencies were taken into account, resulting in some cases of underlinking. To address all this mess a machinery is added for tracking which dependency belongs to which library component and then leveraged to determine correct dependencies for all individual libraries.
* | configure: remove libdl dependency from libndi_newtekMarton Balint2017-10-11
| | | | | | | | | | | | | | We are not using dynamic loading for libndi. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | RELEASE: update for git after 3.4 branchpointMichael Niedermayer2017-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Bump version for master after 3.4 branchpointMichael Niedermayer2017-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/rkmppdec: check wether typoMichael Niedermayer2017-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/opusenc_psy: Fix mixed declaration and statementMichael Niedermayer2017-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/APIchanges: Add 3.4 cut pointMichael Niedermayer2017-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Bump minor versions for branching 3.4Michael Niedermayer2017-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | doc/APIchanges: UpdateMichael Niedermayer2017-10-11
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avutil/frame: Fix project nameMichael Niedermayer2017-10-11
| | | | | | | | | | | | Issue introduced in: caa12027baf1180453846c58da08fc87accc0ff6 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mips: Improve avc uni copy mc msa functionsKaustubh Raste2017-10-10
| | | | | | | | | | | | | | | | Load the specific bytes instead of MSA load. Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mips: Improve hevc uni-w horiz mc msa functionsKaustubh Raste2017-10-10
| | | | | | | | | | | | | | | | | | | | Load the specific destination bytes instead of MSA load and pack. Pack the data to half word before clipping. Use immediate unsigned saturation for clip to max saving one vector register. Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mips: Improve avc put mc 21, 23 and 02 msa functionsKaustubh Raste2017-10-10
| | | | | | | | | | | | | | | | Remove loops and unroll as block sizes are known. Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mips: Improve avc chroma hv mc msa functionsKaustubh Raste2017-10-10
| | | | | | | | | | | | | | | | Replace generic with block size specific function. Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mips: Improve avc bi-weighted mc msa functionsKaustubh Raste2017-10-10
| | | | | | | | | | | | | | | | Replace generic with block size specific function. Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mips: preload data in hevc sao edge 135 degree filter msa functionsKaustubh Raste2017-10-10
| | | | | | | | | | | | Signed-off-by: Kaustubh Raste <kaustubh.raste@imgtec.com> Reviewed-by: Manojkumar Bhosale <Manojkumar.Bhosale@imgtec.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/ffv1dec: Fix out of array read in slice countingMichael Niedermayer2017-10-10
| | | | | | | | | | | | | | Fixes: test-201710.mp4 Found-by: 连一汉 <lianyihan@360.cn> and Zhibin Hu Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dirac_dwt: Fix integer overflow in COMPOSE_53iL0()Michael Niedermayer2017-10-10
| | | | | | | | | | | | | | | | Fixes: runtime error: signed integer overflow: 2147483646 + 2 cannot be represented in type 'int' Fixes: 3485/clusterfuzz-testcase-minimized-4940429332054016 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpeg_er: Clear mcsel in mpeg_er_decode_mb()Michael Niedermayer2017-10-10
| | | | | | | | | | | | | | | | Fixes out of array read Should fix: 3516/clusterfuzz-testcase-minimized-4608518562775040 (not reprodoceable) Found-by: Insu Yun, Georgia Tech. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/mpeg4videodec: Use 64 bit intermediates for sprite deltaMichael Niedermayer2017-10-10
| | | | | | | | | | | | | | | | | | Fixes: runtime error: signed integer overflow: -104713 * 65536 cannot be represented in type 'int' Fixes: 3453/clusterfuzz-testcase-minimized-5555554657239040 Fixes: 3528/clusterfuzz-testcase-minimized-6283628420005888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | configure: fix decklink dependenciesMarton Balint2017-10-10
| | | | | | | | | | | | | | We don't need libdl for win32/mingw. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | doc/filters: note minimum resolution for pixscopeGyan Doshi2017-10-10
| | | | | | | | | | Signed-off-by: Gyan Doshi <gyandoshi@gmail.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | libavdevice/decklink: add support for 10-bit output for Decklink SDIDevin Heitmueller2017-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be tested via the following command: ./ffmpeg -i foo.ts -f decklink -vcodec v210 'DeckLink Duo (1)' Note that the 8-bit support works as it did before, and setting the pix_fmt isn't required for 10-bit mode. The code defaults to operating in 8-bit mode when no vcodec is specified, for backward compatibility. Updated to reflect feedback from Marton Balint <cus@passwd.hu> Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | libavdevice/decklink: add support for -sources and -sinks argumentsDevin Heitmueller2017-10-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for enumerating the sources/sinks via the ffmpeg command line options, as opposed to having to create a real pipeline and use the "-list_devices" option which does exit() after dumping out the options. Note that this patch preserves the existing "-list_devices" option, but now shares common code for the actual enumeration. Updated to reflect feedback from Marton Balint <cus@passwd.hu>. Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com> Signed-off-by: Marton Balint <cus@passwd.hu>
* | Makefile: generate stripped CLI tools directly instead of copying unstripped ↵Marton Balint2017-10-10
| | | | | | | | | | | | | | | | ones first Now works with --disable-stripping. Signed-off-by: Marton Balint <cus@passwd.hu>
* | fate: update fate-api reference files after 71e2ec017aJames Almer2017-10-09
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | build: prevent SDL2 from polluting global cflags and extralibsJames Almer2017-10-09
| | | | | | | | | | | | | | | | | | Remove the SDL_main define from the global cflags but not from the ffplay cflags, and the -mwindows linker option from extralibs instead of overriding it with the addition of -mconsole. Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: James Almer <jamrial@gmail.com>
* | lavc/vaapi_decode: fix profile search when profile mismatch is allowedJun Zhao2017-10-09
| | | | | | | | | | | | | | | | When profile mismatch is allowed, use the highest supported profile for VAAPI decoding. Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>