summaryrefslogtreecommitdiffstats
path: root/libavformat/oggdec.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | lavc & lavf: replace deprecated av_log* functionsPaul B Mahol2013-03-151-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | oggdec: chained oggs have timestamp discontinuitiesMichael Niedermayer2013-02-271-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: remove unused variablesMichael Niedermayer2013-01-211-2/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: #if 0 disabled codeMichael Niedermayer2013-01-211-0/+2
| | | | | | | | | | Fixes CID968589 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: Support chained streams, support replacing streams in multistream files.Michael Niedermayer2013-01-201-9/+28
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: Changelog
* | oggdec: Leave treatment of serial changes to the decoder.Michael Niedermayer2013-01-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Attempting to re-parse the headers at demuxer level is a pandora box the way its done currently. This allows full reconfiguration of vorbis streams Fixes Ticket2117 Fixes Ticket2121 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: resync from the last page.Michael Niedermayer2013-01-151-0/+10
| | | | | | | | | | | | | | Previously we re synced from where we where which cam lead to loosing pages. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-01-071-0/+4
|\ \ | |/ | | | | | | | | | | * 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-061-0/+4
| |
* | Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07'Michael Niedermayer2013-01-071-14/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '89b51b570daa80e6e3790fcd449fe61fc5574e07': oggdec: free the ogg streams on read_header failure Conflicts: libavformat/oggdec.c Original commit this was based on: (this merge just moves the function up) commit 07a866282f08985c65c47ebabcf7b20f1c46daa0 Author: Michael Niedermayer <michaelni@gmx.at> Date: Tue Nov 20 15:12:37 2012 +0100 oggdec: fix memleak on header parsing failure Fixes Ticket1931 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: free the ogg streams on read_header failureLuca Barbato2013-01-061-14/+16
| | | | | | | | Plug an annoying memory leak on broken files.
* | oggdec: fix warning: assignment discards qualifiers from pointer target typeMichael Niedermayer2012-12-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'Michael Niedermayer2012-12-241-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a': Return proper error code after av_log_ask_for_sample() configure: cosmetics: Separate hwaccel dependencies from decoders/encoders oggdec: check memory allocation Conflicts: configure libavcodec/pictordec.c libavformat/anm.c libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: check memory allocationLuca Barbato2012-12-231-2/+9
| |
* | Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'Michael Niedermayer2012-12-241-121/+129
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'f5f1cf52240759208b42477e2157a7b4409ade10': oggdec: K&R cosmetic formatting hlsenc: correctly report target duration Conflicts: libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: K&R cosmetic formattingLuca Barbato2012-12-231-117/+128
| |
* | oggdec: prevent codec from changing through ogg_replace_stream()Michael Niedermayer2012-12-051-0/+3
| | | | | | | | | | | | | | This prevents inconsistencies leading to out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: fix memleak on header parsing failureMichael Niedermayer2012-11-201-1/+4
| | | | | | | | | | | | Fixes Ticket1931 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix various uses of av_log_missing_feature()Michael Niedermayer2012-10-211-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'Michael Niedermayer2012-09-251-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'd1f05dd18375f2f8e68372edee11436927e43ba8': ogg: calculate the start position once all the headers are parsed Conflicts: libavformat/oggdec.c libavformat/oggparseskeleton.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: calculate the start position once all the headers are parsedLuca Barbato2012-09-241-0/+4
| | | | | | | | | | The fisbone packets can be muxed in any order as long the last one comes before the first data packet.
* | oggdec: print a warning if the number of headers mismatch expectations.Michael Niedermayer2012-09-251-1/+6
| | | | | | | | | | | | | | | | This is based on: commit 7751e4693dd10ec98c20fbd9887233b575034272 Author: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: print error when headers couldnt be parses successfullyMichael Niedermayer2012-09-251-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer2012-09-251-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-1/+12
| | | | | | | | Not having the header for a codec is a tell-tale of a broken file.
* | lavf/oggdec: check for begin-of-stream flag in case of chained streams.Clément Bœsch2012-09-221-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Fix Ticket #1617, revealing a regression I introduced in 8f3eebd. We need to make sure no stream is added in between Ogg context save and restore operations (because it would likely lead to a mismatch between ogg->nstreams and AVFormatContext->nb_streams after the restore op). This is the reason the ogg->state check is added in ogg_new_stream(). Before this patch, checking for ogg->headers was preventing this: ogg->headers is always set before any ogg save/restore (though, it was also preventing from creating the stream when necessary).
* | lavf/oggdec: reword stream creation error message.Clément Bœsch2012-09-161-1/+1
| |
* | lavf/oggdec: reindent and comment blocks.Clément Bœsch2012-09-161-8/+9
| |
* | lavf/oggdec: make stream replacement less convoluted.Clément Bœsch2012-09-161-18/+40
| | | | | | | | Also re-use the allocated buffer instead of re-allocating a new one.
* | lavf/oggdec: more explicit zeroing of the new ogg stream.Clément Bœsch2012-09-161-1/+1
| |
* | lavf/oggdec: rework allocations in ogg_new_streams().Clément Bœsch2012-09-161-4/+12
| |
* | lavf/oggdec: simplify destroying streams with chained audio streams.Clément Bœsch2012-09-161-6/+3
| | | | | | | | nstreams is assumed to be 1 at that point, so the loop is pointless.
* | lavf/oggdec: rename str to sid.Clément Bœsch2012-09-161-9/+9
| | | | | | | | | | "str" is misleading here (it's often used for string). "sid" makes more sense to identify a stream id.
* | lavf/oggdec: remove a comment not matching anything.Clément Bœsch2012-09-161-1/+0
| |
* | lavf/oggdec: inline ogg_get_headers().Clément Bœsch2012-09-161-19/+8
| | | | | | | | | | | | | | There is no point in a distant definition of a small function like this used only once. Additional spacing to distinguish better the block.
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-071-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | oggdec: Initialize stream index to -1 in ogg_packet.Reimar Döffinger2012-08-051-3/+11
| | | | | | | | | | | | | | | | | | | | The previous method of having to initialize it outside lead to incorrect code: even if it was initialized, it usually was only initialized once, thus a packet that could not be matched to any stream would just be processed with the return values from the previous call. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | oggdec: simplify start time calculation code.Reimar Döffinger2012-08-051-6/+4
| | | | | | | | | | | | | | Also slightly more correct behaviour in case streams_left for some reason is 0 from the start. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | oggdec: check stream index before using it in ogg_get_length()Michael Niedermayer2012-08-051-0/+3
| | | | | | | | | | | | | | | | | | Fixes crash based on a uninitialized array index read. If the read does not crash then out of array writes based on the same index might have been triggered afterwards. Found-by: inferno@chromium.org Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: add support for Opus codec.Nicolas George2012-07-201-0/+1
| | | | | | | | This patch also introduces CODEC_ID_OPUS.
* | oggdec: fix regression that caused reading the whole file during openMichael Niedermayer2012-06-021-0/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: rewrite first timestamp reading code.Michael Niedermayer2012-05-141-11/+10
| | | | | | | | | | | | | | | | this is simpler and closer to how timestamps are found for seeking. Fixes Ticket1186 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: in ogg_get_length() start from data_offset not 0.Michael Niedermayer2012-05-141-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: fix off by one error on pos_limitMichael Niedermayer2012-05-041-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: print error on failure to create streamsMichael Niedermayer2012-05-041-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: print error on changing streams when its unsupported.Michael Niedermayer2012-05-041-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: print error on unsupported versionsMichael Niedermayer2012-05-041-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: reset lastpts so that justins vorbis duration correction is not skipedMichael Niedermayer2012-05-041-0/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: pass avformat context to ogg_reset()Michael Niedermayer2012-05-041-4/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: Safety check against stream counts being inconsistent in seek()Michael Niedermayer2012-04-171-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud