Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavformat/oggparsevorbis.c
AgeCommit message (Collapse)Author
2014-06-11avformat/oggparsevorbis: Dont attempt to calculate timestamps from gp=0Michael Niedermayer
Fixes Ticket3710 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'Michael Niedermayer
* commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28matroskadec: parse the channel layout mask for FLACAnton Khirnov
It is commonly stored in a vorbiscomment block in codec private data.
2014-04-24Use correct msvc type specifiers for ptrdiff_t and size_t.Carl Eugen Hoyos
The Windows runtime aborts if it finds %t or %z. Fixes ticket #3472. Reviewed-by: Ronald Bultje
2014-04-06avformat/oggparsevorbis: remove non functional null checkMichael Niedermayer
Fixes CID1197055 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-05Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'Michael Niedermayer
* commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4': oggparsevorbis: export replaygain tags from Vorbis comments Conflicts: libavformat/Makefile libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-04oggparsevorbis: export replaygain tags from Vorbis commentsAlessandro Ghedini
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-03-05avformat/oggparsevorbis: dont use invalid granulesMichael Niedermayer
Fixes Ticket3437 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-02avformat/oggparsevorbis: check packet size before reading new_len from itMichael Niedermayer
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 <michaelni@gmx.at>
2014-02-16oggdec/vorbis: fix stream duration conditionHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-06vorbis: extract metadata from the middle of a streamBen Boeckel
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 <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-06vorbis: append data from tags togetherBen Boeckel
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 <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 '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-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-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-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-06oggparsevorbis: return meaningful errorsVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-10-04Merge commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48'Michael Niedermayer
* commit '49fe9c05f97bc2cfafd8fdcfea2f313d7c8e2c48': oggparsevorbis: K&R formatting cosmetics Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04oggparsevorbis: K&R formatting cosmeticsVittorio Giovara
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-09-27Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9': lavf: Reset the entry count and allocation size variables on av_reallocp failures Conflicts: libavformat/avienc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-27lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö
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ö <martin@martin.st>
2013-09-19Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer
* 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 <michaelni@gmx.at>
2013-09-18avformat: Use av_reallocp() where suitableAlexandra Khirnova
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-08-14Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'Michael Niedermayer
* commit '3562684db716d11de0b0dcc52748e9cd90d68132': ogg: Always alloc the private context in vorbis_header Conflicts: libavformat/oggparsevorbis.c See: 18b46a494ef3592d69f4638dac1ebb613c0f548d Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13ogg: Always alloc the private context in vorbis_headerLuca Barbato
It is possible to have an initial broken header and then valid packets. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-08-07avformat/oggparsevorbis: fix leak of ttMichael Niedermayer
Fixes CID1061059 Fixes fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-07avformat/oggparsevorbis: fix leak of ctMichael Niedermayer
Fixes CID1061058 Fixes fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15oggparsevorbis: Support official chapter extensionJames Almer
Fixes ticket #1833 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09vorbiscomment: Add support for embedded cover artJames Almer
Fixes ticket #2655 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07Use the avstring.h locale-independent character type functionsReimar Döffinger
Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-04Remove incorrect use of ctype.h functions.Reimar Döffinger
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 <Reimar.Doeffinger@gmx.de>
2013-01-30fixup_vorbis_headers: add missing malloc failure checkMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30oggparsevorbis: use av_realloc consistentlyPaweł Hajdan, Jr
Memory passed to av_realloc cannot be allocated using memalign. From realloc(3): The realloc() function changes the size of the memory block pointed to by ptr to size bytes. (...) Unless ptr is NULL, it must have been returned by an earlier call to malloc(), calloc() or realloc(). The issue has been found by debugallocation, a part of google-perftools: http://code.google.com/p/gperftools/ . Signed-off-by: Paweł Hajdan, Jr <phajdan@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-10oggdec: fix faulty cleanup prototypeLuca Barbato
2013-01-07oggparsevorbis: fix vorbis_cleanup return typeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: oggdec: make sure the private parse data is cleaned up Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06oggdec: make sure the private parse data is cleaned upLuca Barbato
2012-12-17oggparsevorbis: check channelsMichael Niedermayer
Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer
* commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25ogg: check that the expected number of headers had been parsedLuca Barbato
Not having the header for a codec is a tell-tale of a broken file.
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-05-31oggparsevorbis: fix null ptr dereferenceMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-06oggparsevorbis.c: Check for OOM when using av_mallocz.Carl Eugen Hoyos
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 06:03:23 +0300