Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-08-14Merge commit '3562684db716d11de0b0dcc52748e9cd90d68132'Michael Niedermayer
* commit '3562684db716d11de0b0dcc52748e9cd90d68132': ogg: Always alloc the private context in vorbis_header Conflicts: libavformat/oggparsevorbis.c See: 18b46a494ef3592d69f4638dac1ebb613c0f548d Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-13ogg: Always alloc the private context in vorbis_headerLuca Barbato
It is possible to have an initial broken header and then valid packets. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
2013-08-07avformat/oggparsevorbis: fix leak of ttMichael Niedermayer
Fixes CID1061059 Fixes fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-07avformat/oggparsevorbis: fix leak of ctMichael Niedermayer
Fixes CID1061058 Fixes fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-15oggparsevorbis: Support official chapter extensionJames Almer
Fixes ticket #1833 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09vorbiscomment: Add support for embedded cover artJames Almer
Fixes ticket #2655 Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07Use the avstring.h locale-independent character type functionsReimar Döffinger
Make sure the behavior does not change with the locale. Signed-off-by: Martin Storsjö <martin@martin.st>
2013-03-04Remove incorrect use of ctype.h functions.Reimar Döffinger
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>
2013-01-30fixup_vorbis_headers: add missing malloc failure checkMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-30oggparsevorbis: use av_realloc consistentlyPaweł Hajdan, Jr
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>
2013-01-10oggdec: fix faulty cleanup prototypeLuca Barbato
2013-01-07oggparsevorbis: fix vorbis_cleanup return typeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-07Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: oggdec: make sure the private parse data is cleaned up Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06oggdec: make sure the private parse data is cleaned upLuca Barbato
2012-12-17oggparsevorbis: check channelsMichael Niedermayer
Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-25Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'Michael Niedermayer
* 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>
2012-09-25ogg: check that the expected number of headers had been parsedLuca Barbato
Not having the header for a codec is a tell-tale of a broken file.
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* 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>
2012-08-07Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov
2012-05-31oggparsevorbis: fix null ptr dereferenceMichael Niedermayer
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-06oggparsevorbis.c: Check for OOM when using av_mallocz.Carl Eugen Hoyos
2012-05-05oggvorbis: fix the first 2 packets timestamps matching issueMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-05oggvorbis: move handling of first packets ts from parser to muxer.Michael Niedermayer
The parser does not have enough knowledge it seems to do it correctly. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-05oggvorbisdec: Apply timestamp calculation always when timestamps arent known.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-05oggvorbisdec: redesign special handling of first frames timestamp.Michael Niedermayer
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>
2012-05-04oggvorbis: Try to fix pts off by 1 issue.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-11oggparsevorbis: Remove code messing with cur_dts.Michael Niedermayer
This code caused first_dts to become corrupt and in value to be around relative_ts. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-20oggdec: output correct timestamps for VorbisJustin Ruggles
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.
2012-03-04avcodec: add a Vorbis parser to get packet durationJustin Ruggles
This also allows for removing some of the Vorbis-related hacks.
2011-11-30lavf: make av_set_pts_info private.Anton Khirnov
It's supposed to be called only from (de)muxers.
2011-10-20lavf: use avpriv_ prefix for ff_new_chapter().Anton Khirnov
It's used in libavdevice.
2011-06-08Remove all uses of now deprecated metadata functions.Anton Khirnov
2011-02-07lavf: move internal functions from avformat.h to internal.hAnton Khirnov
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-07Always use av_set_pts_info to set the stream time base.Reimar Döffinger
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-01-31Ogg: discard non-essential metadata from Vorbis header when creating extradataReimar Döffinger
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>
2011-01-29Vorbis-in-Ogg: Do not set timebase to invalid valuesReimar Döffinger
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>
2010-10-16add ff_ prefix to metadata_conv()Anton Khirnov
patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16Fix building, include the header instead of the source fileMartin Storsjö
Builds only seemed to have been broken in some configurations, though. Originally committed as revision 25499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15Export metadata in the generic format. Deprecate old conversion API.Anton Khirnov
patch by Anton Khirnov anton _at_ khirnov _dot_ net Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-08oggparsevorbis: Add some sanity checks to header packet ordering/presence.Alex Converse
Originally committed as revision 24740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini
is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-20Add VorbisComment writing to FLAC files.James Darnley
Patch by James Darnley <james darnley at gmail>. Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12oggdec: Parse ogm chaptersDavid Conrad
Originally committed as revision 22477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12Const correctness for vorbis_commentDavid Conrad
Originally committed as revision 22474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12oggdec: Metadata is per-stream; don't merge multiple streams' togetherDavid Conrad
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12Add ff_ prefix to vorbis_commentDavid Conrad
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11oggdec: Fix memory leak in setting up vorbis headersDavid Conrad
Originally committed as revision 22460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11oggdec: Don't use ogg_stream's seq for vorbis or speex headersDavid Conrad
Originally committed as revision 22459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01Add a list of generic tags and change demuxers to follow it.Anton Khirnov
Patch by Anton Khirnov, wyskas at gmail dot com Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strdupedMichael Niedermayer
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