summaryrefslogtreecommitdiff
path: root/libavformat/oggparsetheora.c
Commit message (Collapse)AuthorAge
* Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'Michael Niedermayer2013-11-01
|\ | | | | | | | | | | | | * commit 'ce6949d3a0607eb318dc2872553110df934e9720': oggparsetheora: stop using deprecated avcodec_set_dimensions Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | * qatar/master: oggparsetheora: check av_mallocz result Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: check av_mallocz resultAnton Khirnov2013-10-30
| |
* | Merge commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | | | | | | | * commit '5e5fb21877d8da7b3b8a27bb4d6a070d210c152d': oggparsetheora: return meaningful error codes Conflicts: libavformat/oggparsetheora.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: return meaningful error codesAnton Khirnov2013-10-30
| |
* | Merge commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68'Michael Niedermayer2013-10-30
|\| | | | | | | | | | | | | | | | | | | * commit 'd4c12b8be4bdd2ffddb3bd5e11773de4c4c46f68': oggparsetheora: K&R cosmetics, reformat Conflicts: libavformat/oggparsetheora.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: K&R cosmetics, reformatAnton Khirnov2013-10-30
| | | | | | | | | | | | | | | | Also typedef the private data struct and make its name consistent with the rest of Libav. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'Michael Niedermayer2013-09-27
|\| | | | | | | | | | | | | | | | | | | * 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>
| * lavf: Reset the entry count and allocation size variables on av_reallocp ↵Martin Storsjö2013-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-18
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * oggparsetheora: fix comment header parsingGiorgio Vazzana2013-01-14
| | | | | | | | | | | | Pass the correct header size to ff_vorbis_comment() Signed-off-by: Martin Storsjö <martin@martin.st>
* | oggparsetheora: fix comment header parsingGiorgio Vazzana2012-10-05
| | | | | | | | | | | | Pass the correct header size to ff_vorbis_comment() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggparsetheora: print error when failing on unknown headerMichael Niedermayer2012-09-25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: pthread: make sure AVFrame.extended_data is set properly. libfdk-aac: reindent after last commit libfdk-aac: Limit to supported sample rates. cbrt_tablegen: Include libm.h oggparsetheora: make it more robust ogg: prevent NULL pointer deference in theora gptopts Conflicts: libavformat/oggparsetheora.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggparsetheora: make it more robustLuca Barbato2012-09-24
| |
| * ogg: prevent NULL pointer deference in theora gptoptsMichael Niedermayer2012-09-24
| | | | | | | | | | | | | | | | Additional safety in case a special ogg stream is crafted with the proper number of 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.
* | oggparsetheora: fix metadata parsingMichael Niedermayer2012-08-12
| | | | | | | | | | Fixes Ticket1508 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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
| |
* | oggtheora: Port changes from oggvorbis timestamp handling.Michael Niedermayer2012-05-05
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggtheora: Fix initial ptsMichael Niedermayer2012-05-04
| | | | | | | | | | | | code based on the solution in vorbis Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vorbisdemux: Check private context in theoras gtopts.Michael Niedermayer2012-03-23
|/ | | | | | | | | This prevents a null ptr dereference. It could be checked differently but this way it should be possible to return some data. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ogg: don't set codec timebaseAnton Khirnov2012-03-02
| | | | Demuxers are not supposed to set it.
* lavf: make av_set_pts_info private.Anton Khirnov2011-11-30
| | | | It's supposed to be called only from (de)muxers.
* 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>
* Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.Jean-Daniel Dupas2010-03-31
| | | | | | 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-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 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: Parse theora headers since ogg might not mark keyframesDavid Conrad2010-03-05
| | | | | | Fixes issue746 Originally committed as revision 22214 to svn://svn.ffmpeg.org/ffmpeg/trunk
* oggdec: Set dts when knownDavid Conrad2010-01-11
| | | | Originally committed as revision 21134 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace invalid Theora frame rate by 25 FPS.Reimar Döffinger2009-07-03
| | | | | | Avoids division by 0 due to e.g. time_base denominator being 0. Originally committed as revision 19334 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ensure that the extradata buffer is padded appripriately in the ogg demuxer.David Conrad2009-06-05
| | | | | | Spotted by valgrind. Originally committed as revision 19119 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use skip_bits_long() for large skipsDavid Conrad2009-05-14
| | | | | | This fixes ogg/theora on ARM (more generally the A32 bitstream reader) Originally committed as revision 18819 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
* OGG: correct PTS with old theora streamsMåns Rullgård2008-11-06
| | | | Originally committed as revision 15785 to svn://svn.ffmpeg.org/ffmpeg/trunk
* OGG: untypedef demuxer structsMåns Rullgård2008-11-06
| | | | Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cosmetics: indentationDavid Conrad2008-10-01
| | | | Originally committed as revision 15501 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Visible width/height fields were added in Theora 3.2David Conrad2008-10-01
| | | | Originally committed as revision 15500 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add ff_ prefix to ogg_codec_t structsReimar Döffinger2008-08-24
| | | | Originally committed as revision 14951 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make ogg_codec_t descriptions constReimar Döffinger2008-08-24
| | | | Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
* convert every muxer/demuxer to write/read sample_aspect_ratio from/toAurelien Jacobs2008-08-23
| | | | | | the corresponding AVStream instead of AVCodecContext Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full path for #includes from another directory.Diego Biurrun2008-05-09
| | | | Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* set PKT_FLAG_KEY for Theora and OGM streamsMåns Rullgård2007-11-11
| | | | Originally committed as revision 11002 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename ogg2.[ch] to oggdec.[ch].Diego Biurrun2007-11-07
| | | | Originally committed as revision 10943 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use AV_RB* macros where appropriate.Ronald S. Bultje2007-07-06
| | | | | | | | patch by Ronald S. Bultje, rsbultje gmail com thread: Re: [FFmpeg-devel] remove int readers date: Sat, 23 Jun 2007 09:32:12 -0400 Originally committed as revision 9499 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 05:08:57 +0000