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

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-04-21Merge commit 'fab8156b2f30666adabe227b3d7712fd193873b1'Derek Buitenhuis
* commit 'fab8156b2f30666adabe227b3d7712fd193873b1': avio: Copy URLContext generic options into child URLContexts Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21libnut: Pass stream to ff_parse_specific_paramsDerek Buitenhuis
This function bo longer takes an AVCodecContext. Fixes ticket #5430. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-21lavf: use new decode APIwm4
From Libav commit 8bc4accc37ab047d2fd85d672c577b39dfc918e1, with additional code for decoding subtitles (not present in Libav). Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-21lavc: introduce a new decoding/encoding API with decoupled input/outputwm4
Until now, the decoding API was restricted to outputting 0 or 1 frames per input packet. It also enforces a somewhat rigid dataflow in general. This new API seeks to relax these restrictions by decoupling input and output. Instead of doing a single call on each decode step, which may consume the packet and may produce output, the new API requires the user to send input first, and then ask for output. For now, there are no codecs supporting this API. The API can work with codecs using the old API, and most code added here is to make them interoperate. The reverse is not possible, although for audio it might. From Libav commit 05f66706d182eb0c36af54d72614bf4c33e957a9. Signed-off-by: Anton Khirnov <anton@khirnov.net>
2016-04-21avformat/utils: Remove use of caps_internal as it is not public APIMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-21avcodec: Add avpriv_codec_get_cap_skip_frame_fill_param()Michael Niedermayer
With this the use of the caps_internal from libavformat can be avoided Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-21avcodec/avpacket: Fix off by 5 errorMichael Niedermayer
Fixes out of array read Fixes: mozilla bug 1266129 Found-by: Tyson Smith Tested-by: Tyson Smith Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-20avcodec/takdec: add code that got somehow lost in process of REingPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-20x86inc: Enable AVX emulation in additional casesAnton Mitrofanov
Allows emulation to work when dst is equal to src2 as long as the instruction is commutative, e.g. `addps m0, m1, m0`.
2016-04-20x86inc: Improve handling of %ifid with multi-token parametersAnton Mitrofanov
The yasm/nasm preprocessor only checks the first token, which means that parameters such as `dword [rax]` are treated as identifiers, which is generally not what we want.
2016-04-20x86inc: Fix AVX emulation of some instructionsAnton Mitrofanov
2016-04-20x86inc: Fix AVX emulation of scalar float instructionsHenrik Gramner
Those instructions are not commutative since they only change the first element in the vector and leave the rest unmodified.
2016-04-20fate: add readvitc filter testTobias Rapp
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-20fate: Add test for ticket 1833 (Ogg/Vorbis Chapters)Michael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-20fate: Add test for mts2 (mss4) codecPetru Rares Sincraian
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-19Merge commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0'Derek Buitenhuis
* commit '564b4591bbe223bdc5f36a1131eaef103f23f5d0': opt: Add av_opt_copy() Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-19Merge commit '8833f1508b7b6afc3172a8017934a7a54428c686'Derek Buitenhuis
This commit is a no-op. * commit '8833f1508b7b6afc3172a8017934a7a54428c686': opt: Add const to av_opt_next Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-19Merge commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310'Derek Buitenhuis
* commit '933dec0e29ec4d2cb83474279a6c52d62fdb7310': file: Add an option for following a file that is being written Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-19avcodec/tak_parser: fix parsing of streams with bunch of small frames at endPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2016-04-18fate: Add test for 012v codecPetru Rares Sincraian
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18fate: Add test for mss1 codecPetru Rares Sincraian
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18Merge commit 'ccea588f831906084b8c8235222920e6984beb72'Derek Buitenhuis
* commit 'ccea588f831906084b8c8235222920e6984beb72': avio: Add an option 'rw_timeout' Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18Merge commit 'd44f3e4059506a182f59218b1e967d42b01e097c'Derek Buitenhuis
* commit 'd44f3e4059506a182f59218b1e967d42b01e097c': avio: Apply avoptions on the URLContext itself as well Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18Merge commit '8a02a8031ef4f98faf5647f0e01a8922247bf748'Derek Buitenhuis
* commit '8a02a8031ef4f98faf5647f0e01a8922247bf748': lavfi: add an NVIDIA NPP-based scaling filter Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18Merge commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d'Derek Buitenhuis
* commit '98114d70e48caf871b0fe9b8e5bf8ebd989b845d': lavf: VAAPI scale filter Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'Derek Buitenhuis
This commit is a no-op. wm4 is working to get these into ffmpeg proper, with ffmpeg versions of the patches. * commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1': lavf: use new decode API avconv: use new encode API avconv: use new decode API lavc: introduce a new decoding/encoding API with decoupled input/output Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18Merge commit '0d2fcdb1c5c9e844c232e5429130727121990d0e'Derek Buitenhuis
These commits are no-ops. Not going to merge these since our opt tests are more complex, and have several blocks with different options. * commit '0d2fcdb1c5c9e844c232e5429130727121990d0e': opt-test: Merge struct declaration and initialization opt-test: Move some variable declarations to avoid block braces Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-18avcodec/dump_extradata_bsf: Add back 'k' and 'e' optionsMichael Niedermayer
broken since af9cac1be1750ecc0e12c6788a3aeed1f1a778be Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18avcodec/remove_extradata_bsf: Add back 'k' and 'e' optionsMichael Niedermayer
broken since af9cac1be1750ecc0e12c6788a3aeed1f1a778be Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18avcodec/bitstream_filter: Fix initializing options from the argument stringMichael Niedermayer
Fixes ffmpeg ... -vbsf noise=234 ... Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18avcodec/intrax8: Remove duplicated chunk from ↵Michael Niedermayer
ba5bcf96124a4933eef170dfe7955809d8d54a64 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-04-18lavc/fic: Cosmetics, fix a typo.Carl Eugen Hoyos
Found by Moritz Barsnick
2016-04-17lavfi/perspective: Add basic timeline editing.Thilo Borgmann
Add number of input and output frames to possible variables. Add option eval to reevaluate coordinate expressions during initialization or for every frame.
2016-04-17Merge commit 'a84713e70d06238100cb0f867ad6031c272054b0'Derek Buitenhuis
This commit is a no-op. * commit 'a84713e70d06238100cb0f867ad6031c272054b0': parseutils-test: Move some variable declarations to avoid block braces Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17lavc/webp: Print a warning for unsupported chunks.Carl Eugen Hoyos
2016-04-17Merge commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7'Derek Buitenhuis
* commit '52385410b7de012c2562fb5ba8f07a4e1112c4e7': des-test: Move a variable declaration to avoid an ifdef Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '65a802401c6cc136576bb2e613c0577cbf622aa8'Derek Buitenhuis
* commit '65a802401c6cc136576bb2e613c0577cbf622aa8': build: Add component for the SRTP common code Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4'Derek Buitenhuis
* commit '30e9ef21cea09fa5e880e979c9f5b39edccbb6f4': timefilter-test: Only compile timefilter-test if JACK is enabled Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7'Derek Buitenhuis
* commit '48362ceadeb2eb5286ae94ef7f9542d990ff7ec7': doc: Update paths to match new examples location Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'Derek Buitenhuis
* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a': Move const qualifier before type name Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit 'd909f43b5c773a73c8d526638744547ba4aa8c59'Derek Buitenhuis
* commit 'd909f43b5c773a73c8d526638744547ba4aa8c59': vc1dec: wmv2dec: Validate ff_intrax8_common_init return value Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '0372e73f917e72c40b09270f771046fc142be4a7'Derek Buitenhuis
* commit '0372e73f917e72c40b09270f771046fc142be4a7': intrax8: Check and propagate errors from ff_intrax8_common_init Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345'Derek Buitenhuis
* commit 'ad8aa8e6c648b61f01b9f106f27b9d4f3d094345': intrax8: Move documentation from implementation to header file Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950'Derek Buitenhuis
* commit '2ade1cdafb96bf47e77f7ed74731d78a30aae950': intrax8: K&R formatting cosmetics Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13'Derek Buitenhuis
* commit '6f5ff559dbd01fa4ea96bc0a1d2e0c21f2db8d13': intrax8: Adjust printf conversion specifier for sizeof expression Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '42244ce07a1f4f5108ae86d50fe72db785d483ed'Derek Buitenhuis
* commit '42244ce07a1f4f5108ae86d50fe72db785d483ed': intrax8: Move a comment to the place it corresponds Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '750562549ceef268b29b94f6a887d9cf331a8c78'Derek Buitenhuis
* commit '750562549ceef268b29b94f6a887d9cf331a8c78': intrax8: Wrap multiline macros in do{}while(0) clauses Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4'Derek Buitenhuis
* commit '0c6a70873fc6e43194b471d112c30823b6c8d0b4': intrax8: Move error resilience out of intrax8 Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc'Derek Buitenhuis
* commit '709c0f79d8032fcf733bfe58e79ca7ff0858c8bc': nuv: Use the correct context for av_image_check_size Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-17Merge commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a'Derek Buitenhuis
* commit '64250d94b74d3fd47cc8b1611f48daf6a6ed804a': indeo4: Consistently initialize variables Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>