summaryrefslogtreecommitdiffstats
path: root/libavformat/oggparsevorbis.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <[email protected]>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-1/+1
| | | | | | | | Signed-off-by: Vittorio Giovara <[email protected]>
* | avformat/oggparsevorbis: Check that initialization succeeded before ↵Michael Niedermayer2014-11-061-3/+3
| | | | | | | | | | | | declaring the end of headers Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/oggparsevorbis: return proper error code from vorbis_header()Michael Niedermayer2014-11-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959'Michael Niedermayer2014-11-061-9/+13
|\| | | | | | | | | | | | | | | | | | | * commit '2f3fadfbe3c6ad52fad5c614b6067c5401227959': lavc,lavf: switch to the new vorbis parse API Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <[email protected]>
| * lavc,lavf: switch to the new vorbis parse APIAnton Khirnov2014-11-061-8/+12
| |
* | Merge commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70'Michael Niedermayer2014-11-061-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '5e80fb7ff226f136dbcf3fed00a2966bf8e9bd70': lavc: add a public API for parsing vorbis packets. Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/version.h libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <[email protected]>
| * lavc: add a public API for parsing vorbis packets.Anton Khirnov2014-11-061-1/+1
| | | | | | | | | | | | It is required by (at least) the ogg demuxer. Mark the current semi-public apriv API for removal.
* | Merge commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67'Michael Niedermayer2014-11-061-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '6896f95b2483e52e717e2c75a4fd24fcb0e14b67': vorbis_parser: add an AV prefix to VorbisParseContext Conflicts: libavcodec/vorbis_parser.c Merged-by: Michael Niedermayer <[email protected]>
| * vorbis_parser: add an AV prefix to VorbisParseContextAnton Khirnov2014-11-061-1/+1
| | | | | | | | This is done in preparation for making it public.
* | Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'Michael Niedermayer2014-08-141-3/+17
|\| | | | | | | | | | | | | | | | | | | * commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8': ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes. Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <[email protected]>
| * ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.Andrew Stone2014-08-131-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, AVFormatContext and a metadata dict were provided to ff_vorbis_comment(), but this presented issues if an AVStream was being updated or the metadata on AVFormatContext wasn't actually being updated. To remedy this, ff_vorbis_stream_comment() explicitly updates a stream's metadata and sets any necessary flags. ff_vorbis_comment() does not modify any flags, and any calls to it that update AVFormatContext's metadata (just a single call) must also update AVFormatContext.event_flags after detecting any metadata changes to the provided dictionary, as signaled by a positive return value. Signed-off-by: Anton Khirnov <[email protected]>
* | avformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0Michael Niedermayer2014-06-111-0/+4
| | | | | | | | | | | | Fixes Ticket3710 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'Michael Niedermayer2014-05-281-3/+4
|\| | | | | | | | | | | | | | | | | | | * commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <[email protected]>
| * matroskadec: parse the channel layout mask for FLACAnton Khirnov2014-05-281-3/+4
| | | | | | | | It is commonly stored in a vorbiscomment block in codec private data.
* | Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos2014-04-241-1/+1
| | | | | | | | | | | | | | The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
* | avformat/oggparsevorbis: remove non functional null checkMichael Niedermayer2014-04-061-1/+1
| | | | | | | | | | | | Fixes CID1197055 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'Michael Niedermayer2014-04-041-1/+8
|\| | | | | | | | | | | | | | | | | | | | | * commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4': oggparsevorbis: export replaygain tags from Vorbis comments Conflicts: libavformat/Makefile libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <[email protected]>
| * oggparsevorbis: export replaygain tags from Vorbis commentsAlessandro Ghedini2014-04-041-1/+8
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | avformat/oggparsevorbis: dont use invalid granulesMichael Niedermayer2014-03-051-1/+1
| | | | | | | | | | | | Fixes Ticket3437 Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/oggparsevorbis: check packet size before reading new_len from itMichael Niedermayer2014-03-021-1/+1
| | | | | | | | | | | | | | Fixes out of array read Fixes: 34260c7981118fb38fba61809bf4dd5a-asan_heap-oob_93b923_1508_cov_951051643_DivX640x480_oggvorbis.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | oggdec/vorbis: fix stream duration conditionHendrik Leppkes2014-02-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | vorbis: extract metadata from the middle of a streamBen Boeckel2014-02-051-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | If a special comment packet shows up in the middle of the stream, we should extract it out into the vorbis stream metadata dictionary. Also, if there is metadata in the packet on the way in, it might linger since we only add data to the dictionary causing stale metadata to be inserted into the stream. Instead, clear it to remove any doubt about what is new and old. Signed-off-by: Ben Boeckel <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | vorbis: append data from tags togetherBen Boeckel2014-02-051-2/+7
| | | | | | | | | | | | | | | | Currently, if there are multiple 'performer' tags, the last one is the only one which appears. Instead, join them with a semicolon. Signed-off-by: Ben Boeckel <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'Michael Niedermayer2013-10-131-3/+1
|\| | | | | | | | | | | | | * commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937': oggparsevorbis: fail on memory allocation error Merged-by: Michael Niedermayer <[email protected]>
| * 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 <[email protected]>
| * oggvorbisdec: add support for embedded cover artJames Almer2013-10-121-1/+27
| | | | | | | | Signed-off-by: James Almer <[email protected]>
* | Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'Michael Niedermayer2013-10-131-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '601d6228c4811d8971a2412a759e1a4ab775ebe8': flac: move picture parsing code in a separate file Conflicts: libavformat/Makefile libavformat/flacdec.c See: 1e5bbbfcf303ec3db0c7db30b85855e2e5358aec Merged-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
| * oggparsevorbis: check allocationsVittorio Giovara2013-10-121-3/+7
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | 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 <[email protected]>
| * oggparsevorbis: support official chapter extensionJames Almer2013-10-121-3/+3
| | | | | | | | | | Signed-off-by: James Almer <[email protected]> Signed-off-by: Anton Khirnov <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-061-11/+11
|\| | | | | | | | | | | | | | | | | | | * qatar/master: oggparsevorbis: return meaningful errors Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <[email protected]>
| * oggparsevorbis: return meaningful errorsVittorio Giovara2013-10-051-11/+11
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'Michael Niedermayer2013-10-041-79/+83
|\| | | | | | | | | | | | | | | | | | | * commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48': oggparsevorbis: K&R formatting cosmetics Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <[email protected]>
| * oggparsevorbis: K&R formatting cosmeticsVittorio Giovara2013-10-031-78/+82
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-271-3/+6
|\| | | | | | | | | | | | | | | | | | | * commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <[email protected]>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-261-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | failures When av_reallocp fails, the associated variables that keep track of the number of elements in the array (and in some cases, the separate number of allocated elements) need to be reset. Not all of these might technically be needed, but it's better to reset them if in doubt, to make sure variables don't end up conflicting. Signed-off-by: Martin Storsjö <[email protected]>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-2/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5626f994f273af80fb100d4743b963304de9e05c': avformat: Use av_reallocp() where suitable Conflicts: libavformat/avidec.c libavformat/avienc.c libavformat/aviobuf.c libavformat/oggparsevorbis.c libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-2/+3
| | | | | | | | Signed-off-by: Diego Biurrun <[email protected]>
* | Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'Michael Niedermayer2013-08-141-3/+3
|\| | | | | | | | | | | | | | | | | | | | | * commit '3562684db716d11de0b0dcc52748e9cd90d68132': ogg: Always alloc the private context in vorbis_header Conflicts: libavformat/oggparsevorbis.c See: 18b46a494ef3592d69f4638dac1ebb613c0f548d Merged-by: Michael Niedermayer <[email protected]>
| * ogg: Always alloc the private context in vorbis_headerLuca Barbato2013-08-131-3/+3
| | | | | | | | | | | | | | It is possible to have an initial broken header and then valid packets. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected]
| * Use the avstring.h locale-independent character type functionsReimar Döffinger2013-03-071-1/+1
| | | | | | | | | | | | Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <[email protected]>
| * oggdec: fix faulty cleanup prototypeLuca Barbato2013-01-091-1/+1
| |
* | avformat/oggparsevorbis: fix leak of ttMichael Niedermayer2013-08-071-0/+2
| | | | | | | | | | | | Fixes CID1061059 Fixes fate Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/oggparsevorbis: fix leak of ctMichael Niedermayer2013-08-071-0/+2
| | | | | | | | | | | | | | Fixes CID1061058 Fixes fate Signed-off-by: Michael Niedermayer <[email protected]>
* | oggparsevorbis: Support official chapter extensionJames Almer2013-07-141-3/+3
| | | | | | | | | | | | | | Fixes ticket #1833 Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | vorbiscomment: Add support for embedded cover artJames Almer2013-07-091-1/+18
| | | | | | | | | | | | | | Fixes ticket #2655 Signed-off-by: James Almer <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-031-1/+1
| | | | | | | | | | | | | | As far as I can tell the code should not change behaviour depending on locale in any of these places. Signed-off-by: Reimar Döffinger <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-23 13:58:30 +0000