summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * riff: Move muxing code to a separate fileDiego Biurrun2013-08-06
| |
* | Merge commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'fcc455ff2e11ed04603aead1984a92ac3a4be226': avformat/dv: K&R formatting cosmetics Conflicts: libavformat/dv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat/dv: K&R formatting cosmeticsDiego Biurrun2013-08-06
| |
* | Merge commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'abe5268c3328bf0e8fcfb7dc6e231b8920177c3a': tcp: Use a different log message and level if there's more addresses to try Conflicts: libavformat/tcp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tcp: Use a different log message and level if there's more addresses to tryMartin Storsjö2013-08-06
| | | | | | | | | | | | | | | | | | This lowers the level of warnings printed if trying to connect to a host name that provides both v6 and v4 addresses but the service only is available on the v4 address (often occurring for 'localhost', with servers that aren't v6-aware). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2a0ec47bd70ebb79e8b2d2f956feeb3a813df798'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '2a0ec47bd70ebb79e8b2d2f956feeb3a813df798': unix: Convert from AVERROR to errno range before comparing error codes Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * unix: Convert from AVERROR to errno range before comparing error codesMartin Storsjö2013-08-06
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * qatar/master: avcodec/options: Drop deprecation warning suppression macros Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec/options: Drop deprecation warning suppression macrosDiego Biurrun2013-08-06
| | | | | | | | | | | | The options table is used in tools built by the host compiler and the deprecation macros pull in bits that are not safe to use if host and target compiler differ.
* | Merge commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '971cce7ebb48a58e72e4dc57b3008e2682bcf4e7': riff.h: Remove stray extern declaration for non-existing symbol Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * riff.h: Remove stray extern declaration for non-existing symbolDiego Biurrun2013-08-05
| |
* | Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab': twinvq: Split VQF-specific part from common TwinVQ decoder core Conflicts: libavcodec/Makefile libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: Split VQF-specific part from common TwinVQ decoder coreKostya Shishkov2013-08-05
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '4d8d16b596c63de85e52488734338fbb41238058'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '4d8d16b596c63de85e52488734338fbb41238058': twinvq: Prefix enums and defines shared with VoxWare MetaSound Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: Prefix enums and defines shared with VoxWare MetaSoundDiego Biurrun2013-08-05
| |
* | Merge commit 'bc909626b0a3c107625f2cb4c85479d18de422a8'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'bc909626b0a3c107625f2cb4c85479d18de422a8': twinvq: move all bitstream reading into single place Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * twinvq: move all bitstream reading into single placeKostya Shishkov2013-08-05
| | | | | | | | | | | | | | | | This is required for the future addition of VoxWare MetaSound decoder, for its functions are mostly the same but bitstream reader is completely different and bitstream format is slightly different too. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae': mpegts: Remove one 64-bit integer modulus operation per packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Remove one 64-bit integer modulus operation per packetBen Avison2013-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | The common case of the pointer having increased by one packet (which results in no change to the modulus) can be detected with a 64-bit subtraction, which is far cheaper than a division on many platforms. Before After Mean StdDev Mean StdDev Change Divisions 248.3 8.8 51.5 7.4 +381.7% Overall 2773.2 25.6 2372.5 43.1 +16.9% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | * commit '43bacd5b7d3d265a77cd29d8abb131057796aecc': vc1: check mb_height validity. See: b5f4836f8cb374f1a5ae45db48b61a1dfba0daad Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: check mb_height validity.Luca Barbato2013-08-05
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | * commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2': vc1: check the source buffer in vc1_mc functions Conflicts: libavcodec/vc1dec.c See: 3a04c18d899d278eea551c216e5117974063062b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: check the source buffer in vc1_mc functionsLuca Barbato2013-08-05
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '9991298f2c4d9022ad56057f15d037e18d454157'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | * commit '9991298f2c4d9022ad56057f15d037e18d454157': bink: Bound check the quantization matrix. See: e70144cba13db208877e3b64802fc8835c72e82d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bink: Bound check the quantization matrix.Luca Barbato2013-08-05
| | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'bb9378251a167ef0116f263912e57f715c1e02ac'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'bb9378251a167ef0116f263912e57f715c1e02ac': network: Use SOCK_CLOEXEC when available Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * network: Use SOCK_CLOEXEC when availableLuca Barbato2013-08-05
| |
* | Merge commit '605387582bd35920b83a26dabbe1c0601f425621'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '605387582bd35920b83a26dabbe1c0601f425621': lavf: Support unix sockets Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Support unix socketsLuca Barbato2013-08-05
| |
* | Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'bc54c2ae3ca6abd225dc331eafc12108513158de': libx264: add shortcut for the bluray compatibility option Conflicts: doc/encoders.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libx264: add shortcut for the bluray compatibility optionLuca Barbato2013-08-05
| | | | | | | | As for intra-refresh it is just a commodity.
* | Merge commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'c84ea750cf765c9d8845fca5546eb0ae25b9c855': mpegts: Make discard_pid() faster for single-program streams Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Make discard_pid() faster for single-program streamsBen Avison2013-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | When a stream contains a single program, there's no point in doing a PID -> program lookup. Normally the one and only program isn't disabled, so no packets should be discarded. Before After Mean StdDev Mean StdDev Change discard_pid() 73.8 9.4 20.2 1.5 +264.8% Overall 2300.8 28.0 2253.1 20.6 +2.1% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'cabb1681697555e2c319c37c1f30f149207e9434'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'cabb1681697555e2c319c37c1f30f149207e9434': mpegts: Remove one memcpy per packet Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Remove one memcpy per packetBen Avison2013-08-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was being performed to ensure that a complete packet was held in contiguous memory, prior to parsing the packet. However, the source buffer is typically large enough that the packet was already contiguous, so it is beneficial to return the packet by reference in most cases. Before After Mean StdDev Mean StdDev Change memcpy 720.7 32.7 649.8 25.1 +10.9% Overall 2372.7 46.1 2291.7 21.8 +3.5% Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'daf1e0d3de03bd424016e2a7520e4e94ece5c0ac': avio: Add an internal function for reading without copying Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avio: Add an internal function for reading without copyingBen Avison2013-08-05
| | | | | | | | | | | | | | | | As long as there is enough contiguous data in the avio buffer, just return a pointer to it instead of copying it to the caller provided buffer. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '22a154e4363b351dd9f321003de01dffebd2fa18'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '22a154e4363b351dd9f321003de01dffebd2fa18': build: Add missing img2.o dependency to apetag.o Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add missing img2.o dependency to apetag.oDiego Biurrun2013-08-05
| |
* | Merge commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit 'bea3d6f4363ff1bbbd99c1717f7498b9fdb12cfc': ismindex: Replace mkdir ifdeffery by os_support.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ismindex: Replace mkdir ifdeffery by os_support.h #includeDiego Biurrun2013-08-05
| | | | | | | | os_support.h contains more precise workarounds for non-POSIX mkdir().
* | avcodec/vdpau: include attributes.h, needed for attribute_deprecatedMichael Niedermayer2013-08-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not definedMichael Niedermayer2013-08-06
| | | | | | | | | | | | Similar to 50fb8c1114b9c2b7d299cbc17a18a457d12069a8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit 'f824535a4a79c260b59d3178b8d958217caffd78': vdpau: deprecate bitstream buffers within the hardware context Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate bitstream buffers within the hardware contextRémi Denis-Courmont2013-08-05
| | | | | | | | | | | | | | | | The bitstream buffers are now private and freed by libavcodec. For backward compatibility, the hold bitstream buffer pointer is left NULL (applications were supposed to av_freep() it). Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | * commit '2852740e23f91d6775714d7cc29b9a73e1111ce0': vdpau: store picture data in picture's rather than codec's context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: store picture data in picture's rather than codec's contextRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not definedMichael Niedermayer2013-08-06
| | | | | | | | | | | | | | | | Prevent build failure for applicatins using the old API This could be replaced be a include of version.h but some applications would then need extern C wrapers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | * commit '549294fbbe1c00fee37dc4d3f291b98945e11094': vdpau: deprecate VDPAU codec capability Conflicts: libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vdpau: deprecate VDPAU codec capabilityRémi Denis-Courmont2013-08-05
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 03:44:31 +0000