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
2014-05-01Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0'Michael Niedermayer
* commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0': oggparseskeleton: do not use AVCodecContext.codec_name Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-01oggparseskeleton: do not use AVCodecContext.codec_nameAnton Khirnov
That field is undocumented, of dubious use, and will be deprecated.
2013-07-07oggparseskeleton: avoid header parsing failureMichael Niedermayer
Based on description by James Almer and the xiph wiki Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06oggparseskeleton: Replace avpriv_report_missing_feature() with a normal ↵James Almer
av_log() call since there should not be more than one fisbone for a given stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-06oggparseskeleton: Fix fisbone header parsingJames Almer
start_granule should be applied to the stream referenced in the fisbone packet, not to the Skeleton stream. This was broken in d1f05dd18375f2f8e68372edee11436927e43ba8 and produced bogus warnings about multiple fisbone in the same stream on files with more than one stream. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-14Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'Michael Niedermayer
* commit '63d744e2be39466e3a734c2987cd713e0bac101e': av_log_missing_feature() ---> avpriv_report_missing_feature() Conflicts: libavcodec/aacdec.c libavcodec/tta.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-13av_log_missing_feature() ---> avpriv_report_missing_feature()Diego Biurrun
2013-01-08oggparseskeleton: Check the overall start time before using it.Michael Niedermayer
Fixes division by zero Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'Michael Niedermayer
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714': fate: Declare avcodec/avformat deps in the respective Makefile snippets fate: Add dependencies for WMA and WavPack tests Improve wording and spelling of av_log_missing_feature messages. lavu: remove disabled FF_API_AV_FIFO_PEEK cruft Conflicts: libavcodec/aacsbr.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-23Improve wording and spelling of av_log_missing_feature messages.Diego Biurrun
2012-10-09Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: mingw/cygwin: Stop adding -fno-common to gcc CFLAGS Restructure av_log_missing_feature message rtp: Support packetization/depacketization of opus file: Set the return value type for lseek to int64_t. ppc: fix Altivec build with old compilers build: add LTO support for PGI compiler build: add -Mdse to PGI optimisation flags rtpenc_vp8: Update the packetizer to the latest spec version rtpdec_vp8: Make the depacketizer implement the latest spec draft doc: allow building with old texi2html versions avutil: skip old_pix_fmts.h since it is just a list Conflicts: libavcodec/aacdec.c libavcodec/h264.c libavcodec/ppc/fmtconvert_altivec.c libavcodec/utils.c libavformat/file.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-09Restructure av_log_missing_feature messageDiego Biurrun
Some invocations include a verb in the log message, others do not. Yet av_log_missing_feature expects callers to provide a verb. Change the function to include a verb instead and update the callers accordingly. The result is a more natural function API and correct English in the function invocations.
2012-09-25Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'Michael Niedermayer
* 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>
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: calculate the start position once all the headers are parsedLuca Barbato
The fisbone packets can be muxed in any order as long the last one comes before the first data packet.
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-03-23vorbisdemux: Check private context in theoras gtopts.Michael Niedermayer
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>
2012-02-04Remove warning about Ogg skeleton v4.Reimar Döffinger
We can handle v4 just fine, the parts we currently use are the same for v3 and v4. v4 can in addition contain an index which we so far do not use though. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2011-12-01Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: rtpdec: Templatize the code for different g726 bitrate variants rv40: move loop filter to rv34dsp context lavf: make av_set_pts_info private. rtpdec: Add support for G726 audio rtpdec: Add an init function that can do custom codec context initialization avconv: make copy_tb on by default. matroskadec: don't set codec timebase. rmdec: don't set codec timebase. avconv: compute next_pts from input packet duration when possible. lavf: estimate frame duration from r_frame_rate. avconv: update InputStream.pts in the streamcopy case. Conflicts: avconv.c libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/oss_audio.c libavdevice/v4l.c libavdevice/v4l2.c libavdevice/vfwcap.c libavdevice/x11grab.c libavformat/au.c libavformat/eacdata.c libavformat/flvdec.c libavformat/mpegts.c libavformat/mxfenc.c libavformat/rtpdec_g726.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-30lavf: make av_set_pts_info private.Anton Khirnov
It's supposed to be called only from (de)muxers.
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-09Fix compile warning.Ronald S. Bultje
Change int64_t into a int, which caused this compiler warning: libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type (cherry picked from commit 69ff14920429c9e128a8bcf65ce3f4b4aa93f3d1)
2011-02-07Fix compile warning.Ronald S. Bultje
Change int64_t into a int, which caused this compiler warning: libavformat/oggparseskeleton.c:64: warning: passing argument 2 of ‘av_reduce’ from incompatible pointer type
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-02-05Always use av_set_pts_info to set the stream time base.Reimar Döffinger
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-28correct first pts for ogg skeletonAurelien Jacobs
Originally committed as revision 22705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11oggdec: Parse skeleton to determine the start time of each streamDavid Conrad
Originally committed as revision 22457 to svn://svn.ffmpeg.org/ffmpeg/trunk