aboutsummaryrefslogtreecommitdiff
path: root/libavformat
AgeCommit message (Collapse)Author
2013-10-14Merge commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4'Michael Niedermayer
* commit 'eb8b05a3824a9fa85e20d603595ac8a3b83505d4': http: Add an option for forcing basic authentication Conflicts: libavformat/http.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_tPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13avformat: use ff_alloc_extradata()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13avformat: add ff_alloc_extradata() helperPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13avformat/oggparseopus: fix nb_headersMichael Niedermayer
Line comes from ecab1c77410f023b437c6ed3a3281be8f039e574 and was not merged previously Thanks-to: Nicolas George <george@nsup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13http: Add an option for forcing basic authenticationMartin Storsjö
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>
2013-10-13avformat/vocdec: return AVERROR_EOF when EOF is reachedPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-13Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'Michael Niedermayer
* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937': oggparsevorbis: fail on memory allocation error Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13Merge commit 'c18375ec8040a9fe0f186b2033dc975883143758'Michael Niedermayer
* commit 'c18375ec8040a9fe0f186b2033dc975883143758': oggvorbisdec: add support for embedded cover art Conflicts: libavformat/oggparsevorbis.c See: 193782216fc8179ec92d498449be0a51e4c7c658 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'Michael Niedermayer
* 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>
2013-10-13Merge commit 'ecab1c77410f023b437c6ed3a3281be8f039e574'Michael Niedermayer
* 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>
2013-10-13Merge commit 'ed9245dba83f9add60f55718b537b0af2105c60e'Michael Niedermayer
* commit 'ed9245dba83f9add60f55718b537b0af2105c60e': oggparsevorbis: check allocations Conflicts: libavformat/oggparsevorbis.c See: 033f1644b59abd755bb529afa5db394d18d9c30b See: 84aea80f7824c23b4cbf101f03e2b5b418a79d80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13Merge commit '9c15ef35d404fca2adc31276c1eedb11cf485461'Michael Niedermayer
* commit '9c15ef35d404fca2adc31276c1eedb11cf485461': oggparsevorbis: support official chapter extension Conflicts: libavformat/oggparsevorbis.c See: 04b9836274f390e39879c2666f7967990f0382cc Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13lavc: rename h265 to hevc, add AV_CODEC_ID_H265 with identical value for ↵Michael Niedermayer
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>
2013-10-12avformat/avr: use ff_get_pcm_codec_id()Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-10-12oggparsevorbis: fail on memory allocation errorVittorio Giovara
2013-10-12oggvorbisdec: add support for embedded cover artJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2013-10-12flac: move picture parsing code in a separate fileJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-12oggdec: add support for Opus in Ogg demuxingNicolas George
2013-10-12oggparsevorbis: check allocationsVittorio Giovara
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-12oggparsevorbis: support official chapter extensionJames Almer
Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-10-12Merge remote-tracking branch 'lukaszmluki/master'Michael Niedermayer
* lukaszmluki/master: avformat/ftp: add log regarding passive mode failure avformat/ftp: fix possible deadlock avdevice/pulse_audio_enc: fix stream index Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: riff: Add a mapping for VP6A Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12avformat/ftp: add log regarding passive mode failureLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-12avformat/ftp: fix possible deadlockLukasz Marek
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
2013-10-12riff: Add a mapping for VP6AMartin Storsjö
This allows demuxing VP6A from F4V files. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-12avformat/movenc: set XDCAM codec tag correctlyMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12avformat/movenc: set pretty compressor name for XDCAMMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-12avformat/movenc: make AVStream easier to accessMichael Niedermayer
This adds a AVStream pointer to Track Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-11lavf/riff.c: Fix GeoVision H.264 fourcc.Carl Eugen Hoyos
Fixes d24da748
2013-10-11Add H.264 fourcc GAVC for GeoVision cameras.Carl Eugen Hoyos
2013-10-10mxf: Add jpeg2000 codec to intra only codecsMatthieu Bouron
Conform with SMPTE RP 224 and SMPTE s422. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2013-10-10Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'Michael Niedermayer
* commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90': flvenc: Write proper cropping for VP6 even if there's no extradata Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'Michael Niedermayer
* commit 'be1e1373d267bae2af8a62d79eef736736f24565': flvenc: Support muxing VP6A as well Conflicts: libavformat/flvenc.c See: 42ae83c196d5747e8a87772a50a02a7b3f2855c3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10Merge commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b'Michael Niedermayer
* commit '4d7aeff9a1080e64125f3374d993b2c9c4c2751b': flvenc: Don't pretend to support muxing "plain" VP6 Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'Michael Niedermayer
* commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288': avi: directly resync on DV in AVI read failure Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10Merge commit '756547ce7f4d67a18663503e2157aebed3531703'Michael Niedermayer
* commit '756547ce7f4d67a18663503e2157aebed3531703': avi: DV in AVI must be considered single stream Conflicts: libavformat/avidec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10Merge commit '1cac9accbd1f9b8596122d0735e37b97a844c514'Michael Niedermayer
* commit '1cac9accbd1f9b8596122d0735e37b97a844c514': avi: properly fail if the dv demuxer is missing Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10flvenc: Write proper cropping for VP6 even if there's no extradataMartin Storsjö
This keeps cropping when remuxing from F4V to FLV. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10flvenc: Support muxing VP6A as wellMartin Storsjö
Handle it in the same way as VP6F, except for the codec tag. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10flvenc: Don't pretend to support muxing "plain" VP6Martin Storsjö
The plain VP6 format is vertically flipped compared to VP6F/VP6A. Support for the plain VP6 format was added in 09d8c0ae831 (which also introduced support for muxing VP6F properly in general). Signed-off-by: Martin Storsjö <martin@martin.st>
2013-10-10avi: directly resync on DV in AVI read failureLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-10avi: DV in AVI must be considered single streamLuca Barbato
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-10-10avi: properly fail if the dv demuxer is missingLuca Barbato
CC: libav-stable@libav.org
2013-10-09avformat/wavdec: Dont trust the fact chunk for PCMMichael Niedermayer
Fixes Ticket3033 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-08avformat/movenc: factor out find_fps()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-07avformat/oggparseflac: fix handling of old flac in oggMichael Niedermayer
Improves handling of the file in Ticket1617 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06bmv: Remove unused variableDiego Biurrun
2013-10-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: oggparsevorbis: return meaningful errors Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-06avformat/matroskadec: only set r_frame_rate if the value is within ↵Michael Niedermayer
reasonable limits Fixes Ticket2451 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>