virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
46,270 Commits 37 Branches 400 Tags 467 MiB
304ebed586
Commit Graph

68 Commits

Author SHA1 Message Date
Michael Niedermayer
46a35959d8 Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 
* 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-25 15:15:16 +02:00
Luca Barbato
7751e4693d ogg: check that the expected number of headers had been parsed 
Not having the header for a codec is a tell-tale of a broken file.
 2012-09-24 22:35:29 +02:00
Michael Niedermayer
7a72695c05 Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85' 
* 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-07 22:45:46 +02:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Michael Niedermayer
18b46a494e oggparsevorbis: fix null ptr dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-31 20:25:23 +02:00
Carl Eugen Hoyos
84aea80f78 oggparsevorbis.c: Check for OOM when using av_mallocz. 2012-05-06 12:00:19 +02:00
Michael Niedermayer
45a7b0674d oggvorbis: fix the first 2 packets timestamps matching issue 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 10:57:53 +02:00
Michael Niedermayer
441dce2169 oggvorbis: move handling of first packets ts from parser to muxer. 
The parser does not have enough knowledge it seems to do it
correctly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 01:52:21 +02:00
Michael Niedermayer
fe5c5bccce oggvorbisdec: Apply timestamp calculation always when timestamps arent known. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 00:00:40 +02:00
Michael Niedermayer
1f95ad48ff oggvorbisdec: redesign special handling of first frames timestamp. 
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-04 23:59:26 +02:00
Michael Niedermayer
63eb01d9c1 oggvorbis: Try to fix pts off by 1 issue. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 15:49:37 +02:00
Michael Niedermayer
ca4a3f4a08 oggparsevorbis: Remove code messing with cur_dts. 
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-04-11 14:56:02 +02:00
Justin Ruggles
f63412fc74 oggdec: output correct timestamps for Vorbis 
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-20 14:39:57 -04:00
Justin Ruggles
5602a464c9 avcodec: add a Vorbis parser to get packet duration 
This also allows for removing some of the Vorbis-related hacks.
 2012-03-03 16:43:11 -05:00
Anton Khirnov
c3f9ebf743 lavf: make av_set_pts_info private. 
It's supposed to be called only from (de)muxers.
 2011-11-30 20:34:45 +01:00
Anton Khirnov
1fa395e471 lavf: use avpriv_ prefix for ff_new_chapter(). 
It's used in libavdevice.
 2011-10-20 20:57:23 +02:00
Anton Khirnov
d2d67e424f Remove all uses of now deprecated metadata functions. 2011-06-08 07:43:45 +02:00
Anton Khirnov
19711af5cd lavf: move internal functions from avformat.h to internal.h 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 16:35:00 -05:00
Reimar Döffinger
a351110eea Always use av_set_pts_info to set the stream time base. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-06 16:08:59 -05:00
Reimar Döffinger
8cb3c557a9 Ogg: discard non-essential metadata from Vorbis header when creating extradata 
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-31 20:21:26 +00:00
Reimar Döffinger
ce20edb7bd Vorbis-in-Ogg: Do not set timebase to invalid values 
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>
 2011-01-29 13:48:13 +00:00
Anton Khirnov
ad7768f4c4 add ff_ prefix to metadata_conv() 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-16 13:20:41 +00:00
Martin Storsjö
fb66c31da4 Fix building, include the header instead of the source file 
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-16 08:50:50 +00:00
Anton Khirnov
03700d399b Export metadata in the generic format. Deprecate old conversion API. 
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-10-15 19:04:25 +00:00
Alex Converse
73c44cb286 oggparsevorbis: Add some sanity checks to header packet ordering/presence. 
Originally committed as revision 24740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-08-07 21:30:34 +00:00
Stefano Sabatini
72415b2adb Define AVMediaType enum, and use it instead of enum CodecType, which 
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-30 23:30:55 +00:00
James Darnley
66061a1220 Add VorbisComment writing to FLAC files. 
Patch by James Darnley <james darnley at gmail>.

Originally committed as revision 22605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-20 13:36:43 +00:00
David Conrad
8730fad595 oggdec: Parse ogm chapters 
Originally committed as revision 22477 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:57 +00:00
David Conrad
533c30fced Const correctness for vorbis_comment 
Originally committed as revision 22474 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:47 +00:00
David Conrad
b53cde48bd oggdec: Metadata is per-stream; don't merge multiple streams' together 
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:44 +00:00
David Conrad
e4d2d8c5d7 Add ff_ prefix to vorbis_comment 
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:39 +00:00
David Conrad
2ac41150c0 oggdec: Fix memory leak in setting up vorbis headers 
Originally committed as revision 22460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:49 +00:00
David Conrad
8f8320d7c3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers 
Originally committed as revision 22459 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-11 07:17:46 +00:00
Anton Khirnov
ca76a11948 Add a list of generic tags and change demuxers to follow it. 
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-01 11:39:10 +00:00
Michael Niedermayer
12ad66712a Use AV_METADATA_DONT_STRDUP* / use av_malloced metadata instead of strduped 
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
 2009-12-13 20:27:29 +00:00
Justin Ruggles
961057decd Remove unnecessary entries in ff_vorbiscomment_metadata_conv. VorbisComment 
keys are case-insensitive.

Originally committed as revision 20267 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-10-17 21:30:50 +00:00
Reimar Döffinger
98422c44cf Fix possible buffer over-read in vorbis_comment, fix it double to be sure. 
First, make s signed, so that comparisons against end - p will not be made as
unsigned, making the check incorrectly pass if p is beyond end.
Also ensure that p will never be > end, so the code is correct also if
buf is not padded.

Originally committed as revision 20014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 15:37:09 +00:00
Reimar Döffinger
7d507ceb79 Correctly print number of remaining bytes in oggparsevorbis instead of always 
with inverted sign.

Originally committed as revision 19978 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 09:18:23 +00:00
Justin Ruggles
d7bb185f99 Add a VorbisComment metadata conversion table and use it in the FLAC and 
Ogg demuxers.

Originally committed as revision 19186 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-13 22:45:58 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h. 
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-13 16:20:26 +00:00
Justin Ruggles
e3b446498a use av_malloc() in vorbis_comment() 
Originally committed as revision 17188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-12 21:39:37 +00:00
Aurelien Jacobs
bf6c32fe50 use new metadata API in ogg/vorbis demuxer 
Originally committed as revision 17164 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-11 23:34:57 +00:00
Diego Biurrun
9686df2be5 Delete unnecessary 'extern' keywords. 
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 15:23:30 +00:00
Måns Rullgård
77be08eeb1 OGG: untypedef demuxer structs 
Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-06 01:50:56 +00:00
Reimar Döffinger
547ea47d4f Add ff_ prefix to ogg_codec_t structs 
Originally committed as revision 14951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-24 17:37:43 +00:00
Reimar Döffinger
cd34bc7617 Make ogg_codec_t descriptions const 
Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-24 17:09:15 +00:00
Siarhei Siamashka
589790c294 OGG: Add padding at end of Vorbis headers 
Patch by Siarhei Siamashka <siarhei.siamashka gmail com>

Originally committed as revision 14249 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-15 23:00:29 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory. 
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-09 11:56:36 +00:00
Baptiste Coudurier
47a0513b0c const 
Originally committed as revision 11762 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 15:17:32 +00:00
Diego Biurrun
a0ddef24ce Rename ogg2.[ch] to oggdec.[ch]. 
Originally committed as revision 10943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-07 20:22:32 +00:00