summaryrefslogtreecommitdiff
path: root/libavformat/oggparsevorbis.c
Commit message (Collapse)AuthorAge
* Remove incorrect use of ctype.h functions.Reimar Döffinger2013-03-03
| | | | | | | 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>
* fixup_vorbis_headers: add missing malloc failure checkMichael Niedermayer2013-01-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* oggparsevorbis: use av_realloc consistentlyPaweł Hajdan, Jr2013-01-30
| | | | | | | | | | | | | | | | 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>
* oggparsevorbis: fix vorbis_cleanup return typeMichael Niedermayer2013-01-07
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-07
|\ | | | | | | | | | | | | * qatar/master: oggdec: make sure the private parse data is cleaned up Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: make sure the private parse data is cleaned upLuca Barbato2013-01-06
| |
* | oggparsevorbis: check channelsMichael Niedermayer2012-12-17
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * ogg: check that the expected number of headers had been parsedLuca Barbato2012-09-24
| | | | | | | | Not having the header for a codec is a tell-tale of a broken file.
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
* | oggparsevorbis: fix null ptr dereferenceMichael Niedermayer2012-05-31
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparsevorbis.c: Check for OOM when using av_mallocz.Carl Eugen Hoyos2012-05-06
| |
* | oggvorbis: fix the first 2 packets timestamps matching issueMichael Niedermayer2012-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggvorbis: move handling of first packets ts from parser to muxer.Michael Niedermayer2012-05-05
| | | | | | | | | | | | | | The parser does not have enough knowledge it seems to do it correctly. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggvorbisdec: Apply timestamp calculation always when timestamps arent known.Michael Niedermayer2012-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggvorbisdec: redesign special handling of first frames timestamp.Michael Niedermayer2012-05-04
| | | | | | | | | | | | This also will make it possible to use the code for cases other than the start of a stream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggvorbis: Try to fix pts off by 1 issue.Michael Niedermayer2012-05-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparsevorbis: Remove code messing with cur_dts.Michael Niedermayer2012-04-11
|/ | | | | | | This code caused first_dts to become corrupt and in value to be around relative_ts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* oggdec: output correct timestamps for VorbisJustin Ruggles2012-03-20
| | | | | | | | | Takes encoder delay into account by comparing first the coded page duration with the calculated page duration. Handles last packet duration if needed, also by comparing coded duration with calculated duration. Also does better handling of timestamp generation for packets in the first page for streamed ogg files where the start time is not necessarily zero.
* avcodec: add a Vorbis parser to get packet durationJustin Ruggles2012-03-03
| | | | This also allows for removing some of the Vorbis-related hacks.
* lavf: make av_set_pts_info private.Anton Khirnov2011-11-30
| | | | It's supposed to be called only from (de)muxers.
* lavf: use avpriv_ prefix for ff_new_chapter().Anton Khirnov2011-10-20
| | | | It's used in libavdevice.
* Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-08
|
* lavf: move internal functions from avformat.h to internal.hAnton Khirnov2011-02-06
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Always use av_set_pts_info to set the stream time base.Reimar Döffinger2011-02-06
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Ogg: discard non-essential metadata from Vorbis header when creating extradataReimar Döffinger2011-01-31
| | | | | | | | | The first part of the metadata, the "vendor" string, is required by libvorbis, it will refuse to play when it is not available. Also we do not currently parse that part into metadata so it would also be lost if we removed it as well. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Vorbis-in-Ogg: Do not set timebase to invalid valuesReimar Döffinger2011-01-29
| | | | | | | | | | Avoids an assert when the sample rate is invalid and the timebase is thus set to e.g. 1/0. Sample file is http://samples.mplayerhq.hu/ogg/fuzzed-srate-crash.ogg This is a quick fix for a crash, not a final solution. Signed-off-by: Mans Rullgard <mans@mansr.com>
* add ff_ prefix to metadata_conv()Anton Khirnov2010-10-16
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix building, include the header instead of the source fileMartin Storsjö2010-10-16
| | | | | | Builds only seemed to have been broken in some configurations, though. Originally committed as revision 25499 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Export metadata in the generic format. Deprecate old conversion API.Anton Khirnov2010-10-15
| | | | | | patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggparsevorbis: Add some sanity checks to header packet ordering/presence.Alex Converse2010-08-07
| | | | Originally committed as revision 24740 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add VorbisComment writing to FLAC files.James Darnley2010-03-20
| | | | | | Patch by James Darnley <james darnley at gmail>. Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: Parse ogm chaptersDavid Conrad2010-03-12
| | | | Originally committed as revision 22477 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Const correctness for vorbis_commentDavid Conrad2010-03-12
| | | | Originally committed as revision 22474 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: Metadata is per-stream; don't merge multiple streams' togetherDavid Conrad2010-03-12
| | | | Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ff_ prefix to vorbis_commentDavid Conrad2010-03-12
| | | | Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: Fix memory leak in setting up vorbis headersDavid Conrad2010-03-11
| | | | Originally committed as revision 22460 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: Don't use ogg_stream's seq for vorbis or speex headersDavid Conrad2010-03-11
| | | | Originally committed as revision 22459 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a list of generic tags and change demuxers to follow it.Anton Khirnov2010-02-01
| | | | | | Patch by Anton Khirnov, wyskas at gmail dot com Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strdupedMichael Niedermayer2009-12-13
| | | | | | | arrays of fixed length. Code from ffmbc with changes to adapt to our metadata API. Originally committed as revision 20836 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unnecessary entries in ff_vorbiscomment_metadata_conv. VorbisCommentJustin Ruggles2009-10-17
| | | | | | keys are case-insensitive. Originally committed as revision 20267 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix possible buffer over-read in vorbis_comment, fix it double to be sure.Reimar Döffinger2009-09-24
| | | | | | | | | First, make s signed, so that comparisons against end - p will not be made as unsigned, making the check incorrectly pass if p is beyond end. Also ensure that p will never be > end, so the code is correct also if buf is not padded. Originally committed as revision 20014 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correctly print number of remaining bytes in oggparsevorbis instead of alwaysReimar Döffinger2009-09-23
| | | | | | with inverted sign. Originally committed as revision 19978 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add a VorbisComment metadata conversion table and use it in the FLAC andJustin Ruggles2009-06-13
| | | | | | Ogg demuxers. Originally committed as revision 19186 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-13
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use av_malloc() in vorbis_comment()Justin Ruggles2009-02-12
| | | | Originally committed as revision 17188 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use new metadata API in ogg/vorbis demuxerAurelien Jacobs2009-02-11
| | | | Originally committed as revision 17164 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Delete unnecessary 'extern' keywords.Diego Biurrun2008-12-03
| | | | Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk