aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * x86inc: FMA3/4 SupportJason Garrett-Glaser2013-10-142-1/+45
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '206895708ea2b464755d340e44501daf9a07c310'Michael Niedermayer2013-10-143-20/+25
|\| | | | | | | | | | | | | * commit '206895708ea2b464755d340e44501daf9a07c310': x86inc: Remove our FMA4 support Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Remove our FMA4 supportDerek Buitenhuis2013-10-143-20/+25
| | | | | | | | | | | | | | | | This is so we can sync to x264's version of FMA4 support. This partialy reverts commit 79687079a97a039c325ab79d7a95920d800b791f. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098'Michael Niedermayer2013-10-141-84/+169
|\| | | | | | | | | | | | | * commit 'c108ba0175d4fc3a3253a8b0f782fbfb96ba5098': x86inc: Use VEX-encoded instructions in AVX functions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86inc: Use VEX-encoded instructions in AVX functionsHenrik Gramner2013-10-141-84/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | Automatically use VEX-encoding in AVX/AVX2/XOP/FMA3/FMA4 functions for all instructions that exists in a VEX-encoded version. This change makes it easier to extend existing code to use AVX2. Also add support for AVX emulation of a few instructions that were missing before. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'Michael Niedermayer2013-10-141-1/+1
|\| | | | | | | | | | | | | * commit '15748773bf33c110e6e2e9526c7ba5478274c74c': avresample/x86: Switch operand order for mulps Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avresample/x86: Switch operand order for mulpsDerek Buitenhuis2013-10-141-1/+1
| | | | | | | | | | | | | | | | With the forthcoming VEX instruction emulation, mulps must have only the third operand point to memory, as this is what vmulps expects. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'Michael Niedermayer2013-10-143-28/+92
|\| | | | | | | | | | | | | * commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c': rtmp: Allocate the prev_pkt arrays dynamically Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Allocate the prev_pkt arrays dynamicallyMartin Storsjö2013-10-143-28/+92
| | | | | | | | | | | | | | | | | | | | Normally, all channel ids are between 0 and 10, while they in uncommon cases can have values up to 64k. This avoids allocating two arrays for up to 64k entries (at a total of over 6 MB in size) each when most of them aren't used at all. Signed-off-by: Martin Storsjö <martin@martin.st>
* | movenc: use ff_alloc_extradata()James Almer2013-10-141-3/+1
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparsecelt: use ff_alloc_extradata()James Almer2013-10-141-12/+3
| | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparseopus: use ff_alloc_extradata()James Almer2013-10-141-6/+2
| | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-141-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: cavs: Check for negative cbp Conflicts: libavcodec/cavsdec.c See: 9f06c1c61e876e930753da200bfe835817e30a53 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cavs: Check for negative cbpLuca Barbato2013-10-131-3/+3
| | | | | | | | | | | | Sample-Id: 00000647-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '1b20d0f581f01f2df601c9e68d0d321672d97af7'Michael Niedermayer2013-10-141-10/+10
|\| | | | | | | | | | | | | | | | | | | * commit '1b20d0f581f01f2df601c9e68d0d321672d97af7': cavs: Return meaningful error values Conflicts: libavcodec/cavsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cavs: Return meaningful error valuesLuca Barbato2013-10-131-10/+10
| |
* | Merge commit '14ddbb477faef359983151b763fd8b20e578651b'Michael Niedermayer2013-10-141-191/+224
|\| | | | | | | | | | | | | | | | | | | * commit '14ddbb477faef359983151b763fd8b20e578651b': cavs: K&R formatting cosmetics Conflicts: libavcodec/cavs.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cavs: K&R formatting cosmeticsLuca Barbato2013-10-131-191/+225
| |
* | avformat/http: check the auth string contents not the pointer which cannot ↵Michael Niedermayer2013-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be NULL It appears this bug originates from a "work in progress" patch from ffmpeg-devel that was heavily redesigned by and integrated in libav And that patch even had a reply and review on the mailing list pointing out that it had a bug. This fixes a deadlock with ffserver See: [FFmpeg-devel] [PATCH] Fix HTTP authentication problem for POST actions. [FFmpeg-devel] [PATCH 1/3] Introduce auth_phase flag, which will be true if authorization needs to be sent, but the type of authorization is not known yet Partial fix #3036 [FFmpeg-devel] [PATCH 2/3] Only add Transfer-Encoding header when not in authorization phase, because server will wait (indefinitely) for data when receiving this header Partial fix #3036 [FFmpeg-devel] [PATCH 3/3] Only allow posting data and/or forcing a 200 code, enabling posting isml chunks, -after- we did a possible first request to get a 403 from the server telling us which type of authentication to apply Final part fix #3036 See: 71549a857b13edf4c4f95037de6ed5bb4c4bd4af Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'Michael Niedermayer2013-10-142-2/+18
|\| | | | | | | | | | | | | | | | | | | * commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af': http: Support auth method detection for POST Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Support auth method detection for POSTMartin Storsjö2013-10-132-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inspired by a patch by Jakob van Bethlehem. But instead of doing an empty POST first to trigger the WWW-Authenticate header (which would succeed if no auth actually was required), add an Expect: 100-continue header, which is meant to be used exactly for cases like this. The header is added if doing a post, and the user has specified authentication but we don't know the auth method yet. Not all common HTTP servers support the Expect: 100-continue header, though, so we only try to use it when it really is needed. The user can request it to be added for other POST requests as well via an option - which would allow the caller to know immediately that the POST has failed (e.g. if no auth was provided but the server required it, or if the target URL simply doesn't exist). This is only done for write mode posts (e.g. posts without pre-set post_data) - for posts with pre-set data, we can just redo the post if it failed due to 401. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'Michael Niedermayer2013-10-142-1/+4
|\| | | | | | | | | | | | | | | | | | | | | * commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4': http: Add an option for forcing basic authentication Conflicts: libavformat/http.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Add an option for forcing basic authenticationMartin Storsjö2013-10-132-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | The default is to autodetect the auth method. This does require one extra request (and also closing and reopening the http connection). For some cases such as HTTP POST, the autodetection is not handled properly (yet). No option is added for digest, since this method requires getting nonce parameters from the server first and can't be used straight away like Basic. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'Michael Niedermayer2013-10-141-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc': pthread: Fix deadlock during thread initialization Conflicts: libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: Fix deadlock during thread initializationDerek Buitenhuis2013-10-132-2/+4
| | | | | | | | | | | | | | | | | | | | Sometimes, if pthread_create() failed, then pthread_cond_wait() could accidentally be called in the worker threads after the uninit function had already called pthread_cond_broadcast(), leading to a deadlock. Don't call pthread_cond_wait() if c->done is set. Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_tPaul B Mahol2013-10-131-8/+8
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-1352-218/+83
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat: add ff_alloc_extradata() helperPaul B Mahol2013-10-132-0/+29
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avcodec/jpeg2000dec: prevent out of array accesses in pixel addressingMichael Niedermayer2013-10-131-4/+4
| | | | | | | | | | | | Fixes Ticket2921 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/jpeg2000: zero i/f_dataMichael Niedermayer2013-10-131-2/+2
| | | | | | | | | | | | | | | | Fixes uninitialized use of variables Fixes part of Ticket2921 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-10-131-16/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: ffplay: add support for changing the channel by the C key ffplay: cycle through the streams of the current program, and not every stream ffplay: add null packet after attached pics packet ffplay: factor out putting null packet into the queue Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffplay: add support for changing the channel by the C keyMarton Balint2013-10-131-0/+6
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: cycle through the streams of the current program, and not every streamMarton Balint2013-10-131-2/+20
| | | | | | | | | | | | | | | | | | | | | When changing the audio, video or subtitle stream, from now on, ffplay will cycle through the streams of the current program. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: add null packet after attached pics packetMarton Balint2013-10-131-0/+1
| | | | | | | | | | | | | | | | | | Fixes ticket #2904. Signed-off-by: Marton Balint <cus@passwd.hu>
| * | ffplay: factor out putting null packet into the queueMarton Balint2013-10-131-14/+14
| | | | | | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* | | avcodec/jpeg2000dec: check transform equality in MCTMichael Niedermayer2013-10-131-0/+6
| | | | | | | | | | | | | | | | | | | | | Fixes null pointer dereference Fixes Ticket2843 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/oggparseopus: fix nb_headersMichael Niedermayer2013-10-131-0/+1
|/ / | | | | | | | | | | | | | | Line comes from ecab1c77410f023b437c6ed3a3281be8f039e574 and was not merged previously Thanks-to: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/vocdec: return AVERROR_EOF when EOF is reachedPaul B Mahol2013-10-131-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | doc/developer: Merge license related policy itemsMichael Niedermayer2013-10-131-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-131-10/+14
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: indeo4: Check the inherited quant_mat Conflicts: libavcodec/indeo4.c See: 884efd4e09696b201457feebdef684aee30be99d Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: Check the inherited quant_matLuca Barbato2013-10-131-6/+12
| | | | | | | | | | | | | | | | Invalidate it if not supported. Sample-Id: 00000262-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'Michael Niedermayer2013-10-131-0/+8
|\| | | | | | | | | | | | | | | | | | | * commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0': indeo4: Check the block size if reusing the band configuration Conflicts: libavcodec/indeo4.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * indeo4: Check the block size if reusing the band configurationLuca Barbato2013-10-131-0/+8
| | | | | | | | | | | | | | Sample-Id: 00000287-google Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'Michael Niedermayer2013-10-131-3/+1
|\| | | | | | | | | | | | | * commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937': oggparsevorbis: fail on memory allocation error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsevorbis: fail on memory allocation errorVittorio Giovara2013-10-121-3/+1
| |
* | Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'Michael Niedermayer2013-10-131-1/+7
|\| | | | | | | | | | | | | | | | | | | | | * commit 'c18375ec8040a9fe0f186b2033dc975883143758': oggvorbisdec: add support for embedded cover art Conflicts: libavformat/oggparsevorbis.c See: 193782216fc8179ec92d498449be0a51e4c7c658 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggvorbisdec: add support for embedded cover artJames Almer2013-10-122-2/+29
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'Michael Niedermayer2013-10-135-14/+15
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '601d6228c4811d8971a2412a759e1a4ab775ebe8': flac: move picture parsing code in a separate file Conflicts: libavformat/Makefile libavformat/flacdec.c See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * flac: move picture parsing code in a separate fileJames Almer2013-10-124-130/+183
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'Michael Niedermayer2013-10-131-22/+29
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ecab1c77410f023b437c6ed3a3281be8f039e574': oggdec: add support for Opus in Ogg demuxing Conflicts: Changelog libavformat/oggparseopus.c libavformat/version.h See: e62fd6619f7aa91956a1b4ccfa7b0b8d7bc4ba90 Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 08:59:48 +0000