summaryrefslogtreecommitdiff
path: root/libavformat/oggdec.c
Commit message (Collapse)AuthorAge
* oggdec: fix invalid free on errorwm42014-08-30
| | | | | | | The read_packet callback passes a pointer to a stack-allocated AVPacket. Attempting to free it with av_free() makes no sense. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: add support for Opus in Ogg demuxingNicolas George2013-10-12
| |
* | replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix dont and doesnt typosMichael Niedermayer2014-04-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: reset nstreams in closeSchenk, Michael2014-04-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec/ogg_read_packet(): factorize failure code pathMichael Niedermayer2014-04-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: check for av_packet_new_side_data() failureMichael Niedermayer2014-04-06
| | | | | | | | | | Fixes CID1197062 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: validate VP8 keyframesJames Almer2014-02-24
| | | | | | | | | | | | | | Fixes seeking with broken files Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ogg: allow streams to update metadataBen Boeckel2014-02-05
| | | | | | | | | | Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: dont read timestamps from EOS pages of ogm videosMichael Niedermayer2014-01-04
| | | | | | | | | | | | | | Some muxers store invalid timestamps there, which breaks seeking Fixes Ticket2739 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: add support for VP8 demuxingJames Almer2013-12-30
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: reset end_trimming when it has been used, so it cannot be ↵Michael Niedermayer2013-12-12
| | | | | | | | | | | | used twice by mistake Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: reset end_trimming in ogg_reset()Dale Curtis2013-12-12
| | | | | | | | | | | | Fixes the output when seeking back to the start Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/oggdec: favor av_freep() over av_free()Michael Niedermayer2013-10-19
| | | | | | | | | | Found-by: Reimar Döffinger Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/ogg: Support for end trimming OpusVignesh Venkatasubramanian2013-09-16
| | | | | | | | | | | | | | | | Adding support for end trimming Opus embedded in Ogg container. Signed-Off By: Vignesh Venkatasubramanian <vigneshv@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f369b9356c4606cd4d713d60f7db5de119d901fa'Michael Niedermayer2013-09-11
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'f369b9356c4606cd4d713d60f7db5de119d901fa': avformat: Use av_reallocp_array() where suitable Conflicts: libavformat/asfenc.c libavformat/gxfenc.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Use av_reallocp_array() where suitableAlexandra Khirnova2013-09-10
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * ogg: Fix potential infinite discard loopReimar Döffinger2013-08-19
| | | | | | | | | | | | | | | | | | | | | | | | Seeking in certain broken files would cause ogg_read_timestamp to fail because ogg_packet would go into a state where all packets of stream 1 would be discarded until the end of the stream. Bug-Id: 553 CC: libav-stable@libav.org Signed-off-by: Jan Gerber <j@v2v.cc> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-07-02
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: oggdec: do not fall back on binary search in the generic code. Conflicts: libavformat/oggdec.c tests/ref/seek/lavf-ogg Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * oggdec: do not fall back on binary search in the generic code.Anton Khirnov2013-07-02
| | | | | | | | | | Binary search is already attempted in the format-specific seek function, so the fallback is only reached if binary search failed already.
* | Merge commit 'f963f701d90bd7bb03e39aab4e59bd137084e082'Michael Niedermayer2013-06-23
|\| | | | | | | | | | | | | | | | | | | * commit 'f963f701d90bd7bb03e39aab4e59bd137084e082': ogg: relax demuxer conformance checks Conflicts: libavformat/oggdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ogg: relax demuxer conformance checksLuca Barbato2013-06-22
| | | | | | | | | | Some samples in the wild are missing headers that are expected by the specification but in practice do not affect decoding.
* | oggdec: Support byte based seekingMichael Niedermayer2013-04-04
| | | | | | | | | | | | Fixed Ticket2317 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc & lavf: replace deprecated av_log* functionsPaul B Mahol2013-03-15
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | oggdec: chained oggs have timestamp discontinuitiesMichael Niedermayer2013-02-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: remove unused variablesMichael Niedermayer2013-01-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: #if 0 disabled codeMichael Niedermayer2013-01-21
| | | | | | | | | | Fixes CID968589 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | oggdec: Support chained streams, support replacing streams in multistream files.Michael Niedermayer2013-01-20
| | | | | | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Conflicts: Changelog
* | oggdec: Leave treatment of serial changes to the decoder.Michael Niedermayer2013-01-15
| | | | | | | | | | | | | | | | | | | | | | | | 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-15
| | | | | | | | | | | | | | 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-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
| |
* | Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07'Michael Niedermayer2013-01-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-06
| | | | | | | | Plug an annoying memory leak on broken files.
* | oggdec: fix warning: assignment discards qualifiers from pointer target typeMichael Niedermayer2012-12-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'Michael Niedermayer2012-12-24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-23
| |
* | Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'Michael Niedermayer2012-12-24
|\| | | | | | | | | | | | | | | | | | | | | * 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-23
| |
* | oggdec: prevent codec from changing through ogg_replace_stream()Michael Niedermayer2012-12-05
| | | | | | | | | | | | | | 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-20
| | | | | | | | | | | | Fixes Ticket1931 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix various uses of av_log_missing_feature()Michael Niedermayer2012-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'Michael Niedermayer2012-09-25
|\| | | | | | | | | | | | | | | | | | | | | * 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-24
| | | | | | | | | | 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-25
| | | | | | | | | | | | | | | | 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-25
| | | | | | | | 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.
* | lavf/oggdec: check for begin-of-stream flag in case of chained streams.Clément Bœsch2012-09-22
| | | | | | | | | | | | | | | | | | | | | | | | 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).