aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
Commit message (Collapse)AuthorAgeFilesLines
* avformat: Use G726LE decoder for Sun AU filesCarl Eugen Hoyos2013-10-181-1/+13
| | | | | | fixes ticket #1955 as suggested by Roman. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Support 4k AVC-Intra in mov.Carl Eugen Hoyos2013-10-181-0/+1
|
* avformat/flvdec: use avpriv_request_sample()Paul B Mahol2013-10-181-2/+2
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2013-10-171-4/+4
|\ | | | | | | | | | | | | * cehoyos/master: Add some necessary casts in the wtv demuxer. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add some necessary casts in the wtv demuxer.Carl Eugen Hoyos2013-10-171-4/+4
| | | | | | | | This reverts e8023dba, fixes ticket #3049.
* | avformat/hevcdec: add more irap cases to hevc_probe()Dirk Farin2013-10-171-2/+6
| | | | | | | | | | | | This fixes fate-hevc-conformance-RAP_A_docomo_4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/hevcdec: cosmetics, whitespacesDirk Farin2013-10-171-24/+26
|/ | | | | | This reduces the difference to the latest hevc demuxer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Support HEVC in transport streams.Carl Eugen Hoyos2013-10-161-0/+1
|
* avformat/mov: fix "correctly" typoMichael Niedermayer2013-10-161-1/+1
| | | | | Found-by: Timothy Gu Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/matroskadec: Support HEVC demuxing.Yusuke Nakamura2013-10-162-1/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/mov: Support HEVC demuxing.Yusuke Nakamura2013-10-162-3/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* hevc: add ts demux supportMickaël Raulet2013-10-151-0/+1
| | | | | | cherry picked from commit 925ee44364a7bce58e2ac5bac91077ce0a75d883 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat: rename a few more h.265 to HEVCMichael Niedermayer2013-10-153-4/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/segment: simplify logic and fix !=0 check on segment_end return valueStefano Sabatini2013-10-151-5/+3
| | | | A successfull return value can be > 0.
* lavf/segment: log segments as they end to AV_LOG_VERBOSEBilly Shambrook2013-10-151-0/+4
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavf/segment: simplify segment_count updateStefano Sabatini2013-10-151-6/+4
| | | | Now segment_count mark the segment_count of the current segment.
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-151-1/+2
|\ | | | | | | | | | | | | | | | | | | * qatar/master: http: Check the auth string contents and not only the pointer Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Check the auth string contents and not only the pointerMichael Niedermayer2013-10-141-1/+2
| | | | | | | | | | | | | | This makes sure we don't send the Except: 100-continue header if no authentication credentials have been provided. Signed-off-by: Martin Storsjö <martin@martin.st>
* | matroskadec: Demux support for SeekPreRoll and CodecDelayVignesh Venkatasubramanian2013-10-141-0/+15
| | | | | | | | | | | | | | | | Adds support for demuxing SeekPreRoll and CodecDelay container elements. Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rpl: use avpriv_report_missing_feature/avpriv_request_samplePaul B Mahol2013-10-141-8/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Support H.264 fourcc UMSV.Carl Eugen Hoyos2013-10-141-0/+1
| | | | | | | | Fixes ticket #3046.
* | 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>
* | 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>
* | 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>
* | 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>
* | 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>
| * oggdec: add support for Opus in Ogg demuxingNicolas George2013-10-125-2/+147
| |
* | Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'Michael Niedermayer2013-10-131-5/+5
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'ed9245dba83f9add60f55718b537b0af2105c60e': oggparsevorbis: check allocations Conflicts: libavformat/oggparsevorbis.c See: 033f1644b59abd755bb529afa5db394d18d9c30b See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsevorbis: check allocationsVittorio Giovara2013-10-121-3/+7
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'Michael Niedermayer2013-10-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | * commit '9c15ef35d404fca2adc31276c1eedb11cf485461': oggparsevorbis: support official chapter extension Conflicts: libavformat/oggparsevorbis.c See: 04b9836274f390e39879c2666f7967990f0382cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsevorbis: support official chapter extensionJames Almer2013-10-121-3/+3
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for ↵Michael Niedermayer2013-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | backward compatibility Somehow 2 different identifiers have come into existence which makes supporting both until the next major version bump required I did not investigate how exactly that did happen. wm4, j-b and smarter prefer hevc. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/avr: use ff_get_pcm_codec_id()Paul B Mahol2013-10-121-10/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>