aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/oggparseogm.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8'Michael Niedermayer2014-08-141-1/+1
|\ | | | | | | | | | | | | | | | | | | * commit 'db68ef898a3802e51b6f41fd600d0d46d058e3f8': ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes. Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: update event_flags with STREAM_/METADATA_UPDATED whenever metadata changes.Andrew Stone2014-08-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 <anton@khirnov.net>
* | Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'Michael Niedermayer2014-05-281-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '23f741f79327e31be7b2a75ebb2e02111e06e52f': matroskadec: parse the channel layout mask for FLAC Conflicts: libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * matroskadec: parse the channel layout mask for FLACAnton Khirnov2014-05-281-1/+1
| | | | | | | | It is commonly stored in a vorbiscomment block in codec private data.
* | Merge commit '75647dea6f7db79b409bad66a119f5c73da730f3'Michael Niedermayer2014-01-061-1/+6
|\| | | | | | | | | | | | | | | * commit '75647dea6f7db79b409bad66a119f5c73da730f3': oggparseogm: check timing variables See: 9ed388f5985992a0a6a43fdc0b1732962b6b5619 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparseogm: check timing variablesAnton Khirnov2014-01-061-0/+5
| | | | | | | | | | | | | | Fixes a potential divide by zero. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org
* | avformat/oggparseogm: check input size before reading tMichael Niedermayer2013-12-261-0/+2
| | | | | | | | | | | | | | | | | | | | Makes no difference in outcome, as the checks on t have no effect when t was uninitialized Fixes use of uninitialized memory Fixes: msan_uninit-mem_7fa2b7b5d97c_3598_anOTHERS_DixX_in_Ogg_Sample.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggparseogm: check input size before reading parametersMichael Niedermayer2013-12-261-0/+6
| | | | | | | | | | | | | | Fixes use of uninitialized memory Fixes: msan_uninit-mem_7f4d0daad100_3599_anOTHERS_DixX_in_Ogg_Sample.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: use ff_alloc_extradata()Paul B Mahol2013-10-131-3/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit '19b9659f3174599e8685d329c4330b1ea8c4c6db'Michael Niedermayer2013-09-171-27/+29
|\| | | | | | | | | | | | | | | | | | | * commit '19b9659f3174599e8685d329c4330b1ea8c4c6db': oggparseogm: Convert to use bytestream2 Conflicts: libavformat/oggparseogm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparseogm: Convert to use bytestream2Martin Storsjö2013-09-171-25/+27
| | | | | | | | | | | | Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-251-0/+4
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-241-0/+4
| | | | | | | | Not having the header for a codec is a tell-tale of a broken file.
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-071-1/+1
| |
| * oggparseogm: fix order of arguments of avpriv_set_pts_info().Michael Niedermayer2012-03-221-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | ogm: Fix division by 0Michael Niedermayer2012-04-181-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparseogm: Fix order or arguments.Michael Niedermayer2012-03-081-1/+1
| | | | | | | | | | | | Bug introduced by libav in 1bb3990b560e7ff7f46c06c14f959fe432e0b625 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-031-5/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) amrwb: remove duplicate arguments from extrapolate_isf(). amrwb: error out early if mode is invalid. h264: change underread for 10bit QPEL to overread. matroska: check buffer size for RM-style byte reordering. vp8: disable mmx functions with sse/sse2 counterparts on x86-64. vp8: change int stride to ptrdiff_t stride. wma: fix invalid buffer size assumptions causing random overreads. Windows Media Audio Lossless decoder rv10/20: Fix slice overflow with checked bitstream reader. h263dec: Disallow width/height changing with frame threads. rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size. rmdec: Honor .RMF tag size rather than assuming 18. g722: Fix the QMF scaling r3d: don't set codec timebase. electronicarts: set timebase for tgv video. electronicarts: parse the framerate for cmv video. ogg: don't set codec timebase electronicarts: don't set codec timebase avs: don't set codec timebase wavpack: Fix an integer overflow ... Conflicts: libavcodec/arm/vp8dsp_init_arm.c libavcodec/fraps.c libavcodec/h264.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/msmpeg4.c libavcodec/pnmdec.c libavcodec/qpeg.c libavcodec/rawenc.c libavcodec/ulti.c libavcodec/vcr1.c libavcodec/version.h libavcodec/wmalosslessdec.c libavformat/electronicarts.c libswscale/ppc/yuv2rgb_altivec.c tests/ref/acodec/g722 tests/ref/fate/ea-cmv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: don't set codec timebaseAnton Khirnov2012-03-021-5/+2
| | | | | | | | Demuxers are not supposed to set it.
* | Make AAC in Ogg (ogm) work.Reimar Döffinger2012-02-181-3/+18
|/ | | | | | | | | | | | This needs the extradata to be extracted. The approach used is the one MPlayer uses, though it is unclear whether the 4 bytes extradata that are skipped should be skipped always or only for AAC. The AAC parser must be disabled, too, otherwise playback still does not work. Fixes trac issue #547. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* lavf: make av_set_pts_info private.Anton Khirnov2011-11-301-2/+3
| | | | It's supposed to be called only from (de)muxers.
* Remove unused variablesMans Rullgard2011-06-021-3/+1
|
* Always use av_set_pts_info to set the stream time base.Reimar Döffinger2011-02-061-3/+2
| | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.Jean-Daniel Dupas2010-03-311-1/+1
| | | | | | Patch by Jean-Daniel Dupas, devlists shadowlab org Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-6/+6
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: Set packet duration for ogm streamsDavid Conrad2010-03-131-0/+3
| | | | Originally committed as revision 22493 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: CosmeticsDavid Conrad2010-03-121-48/+48
| | | | Originally committed as revision 22476 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: Read ogm metadataDavid Conrad2010-03-121-2/+5
| | | | Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix PTS for OGM codecs.David Conrad2009-12-121-4/+8
| | | | | | Fixes issue251 Originally committed as revision 20815 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ff_ prefixes to exported symbols in libavformat/riff.h.Daniel Verkamp2009-06-221-4/+4
| | | | | | patch by Daniel Verkamp, aniel drv nu Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* OGG: untypedef demuxer structsMåns Rullgård2008-11-061-10/+10
| | | | Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ff_ prefix to ogg_codec_t structsReimar Döffinger2008-08-241-4/+4
| | | | Originally committed as revision 14951 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ogg_codec_t descriptions constReimar Döffinger2008-08-241-4/+4
| | | | Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
* parse audio in ogm demuxer.Justin Ruggles2008-05-261-0/+1
| | | | | | fixes issue165. Originally committed as revision 13407 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-091-3/+3
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* constBaptiste Coudurier2008-02-011-1/+1
| | | | Originally committed as revision 11763 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add support for ogg text subtitles.Reimar Döffinger2008-01-311-0/+11
| | | | Originally committed as revision 11698 to svn://svn.ffmpeg.org/ffmpeg/trunk
* set PKT_FLAG_KEY for Theora and OGM streamsMåns Rullgård2007-11-111-0/+3
| | | | Originally committed as revision 11002 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename ogg2.[ch] to oggdec.[ch].Diego Biurrun2007-11-071-1/+1
| | | | Originally committed as revision 10943 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ogm: don't use deprecated codec_get_{bmp,wav}_id()Måns Rullgård2007-07-081-4/+4
| | | | Originally committed as revision 9529 to svn://svn.ffmpeg.org/ffmpeg/trunk
* use bytestream_get_* and AV_RLxxMåns Rullgård2007-07-071-26/+23
| | | | Originally committed as revision 9525 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move common stuff from avienc.c and wav.c to new file riff.cMåns Rullgård2006-07-121-1/+1
| | | | Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
* set stream time_base properlyMåns Rullgård2006-05-121-1/+6
| | | | Originally committed as revision 5367 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ogm demuxingMåns Rullgård2006-05-111-0/+161
Originally committed as revision 5365 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-01 13:56:42 +0000