virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
45,535 Commits 37 Branches 400 Tags 458 MiB
4f5e5a0513
Commit Graph

47 Commits

Author SHA1 Message Date
Giorgio Vazzana
db4bb4c983 oggparsetheora: fix comment header parsing 
Pass the correct header size to ff_vorbis_comment()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-05 18:07:13 +02:00
Michael Niedermayer
d9d56712e9 oggparsetheora: print error when failing on unknown header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 17:32:11 +02:00
Michael Niedermayer
abcaacf1ac Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pthread: make sure AVFrame.extended_data is set properly.
  libfdk-aac: reindent after last commit
  libfdk-aac: Limit to supported sample rates.
  cbrt_tablegen: Include libm.h
  oggparsetheora: make it more robust
  ogg: prevent NULL pointer deference in theora gptopts

Conflicts:
	libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 16:11:34 +02:00
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
Luca Barbato
0336dea2ef oggparsetheora: make it more robust 2012-09-24 22:35:29 +02:00
Michael Niedermayer
bb146bb57b ogg: prevent NULL pointer deference in theora gptopts 
Additional safety in case a special ogg stream is crafted
with the proper number of

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 22:35:29 +02:00
Michael Niedermayer
bb7073921c oggparsetheora: fix metadata parsing 
Fixes Ticket1508
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-08-12 23:09:45 +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
b18c9f1eb0 oggtheora: Port changes from oggvorbis timestamp handling. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-05 00:00:40 +02:00
Michael Niedermayer
231d32c8d7 oggtheora: Fix initial pts 
code based on the solution in vorbis

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-04 14:40:22 +02:00
Michael Niedermayer
f927c5b753 vorbisdemux: Check private context in theoras gtopts. 
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-03-23 04:29:33 +01:00
Anton Khirnov
1bb3990b56 ogg: don't set codec timebase 
Demuxers are not supposed to set it.
 2012-03-02 11:11:38 +01: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
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
Jean-Daniel Dupas
cc947f04cc Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY. 
Patch by Jean-Daniel Dupas, devlists shadowlab org

Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-31 12:29:58 +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
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
8b6bdb6cf3 oggdec: Parse theora headers since ogg might not mark keyframes 
Fixes issue746

Originally committed as revision 22214 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-05 00:22:40 +00:00
David Conrad
2d4970d88d oggdec: Set dts when known 
Originally committed as revision 21134 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-01-11 05:51:09 +00:00
Reimar Döffinger
11d058b7b3 Replace invalid Theora frame rate by 25 FPS. 
Avoids division by 0 due to e.g. time_base denominator being 0.

Originally committed as revision 19334 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-07-03 11:31:09 +00:00
David Conrad
12d7c0793b Ensure that the extradata buffer is padded appripriately in the ogg demuxer. 
Spotted by valgrind.

Originally committed as revision 19119 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-05 23:39:11 +00:00
David Conrad
0a8dedc9e1 Use skip_bits_long() for large skips 
This fixes ogg/theora on ARM (more generally the A32 bitstream reader)

Originally committed as revision 18819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-14 00:02:07 +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
Måns Rullgård
e3b07e1a74 OGG: correct PTS with old theora streams 
Originally committed as revision 15785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-06 01:57:17 +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
David Conrad
a0ce2d1bbc Cosmetics: indentation 
Originally committed as revision 15501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-01 14:44:30 +00:00
David Conrad
277e3e534b Visible width/height fields were added in Theora 3.2 
Originally committed as revision 15500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-01 14:43:08 +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
Aurelien Jacobs
5972945197 convert every muxer/demuxer to write/read sample_aspect_ratio from/to 
the corresponding AVStream instead of AVCodecContext

Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-23 23:43:20 +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
Måns Rullgård
e1a794b272 set PKT_FLAG_KEY for Theora and OGM streams 
Originally committed as revision 11002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-11-11 21:56:18 +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
Ronald S. Bultje
80fb82346e Use AV_RB* macros where appropriate. 
patch by Ronald S. Bultje, rsbultje gmail com
thread: Re: [FFmpeg-devel] remove int readers
date: Sat, 23 Jun 2007 09:32:12 -0400

Originally committed as revision 9499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-06 09:32:34 +00:00
Aurelien Jacobs
b997b67c63 use get_bits_long() where needed 
patch by Aurelien Jacobs, aurel gnuage org

Originally committed as revision 9314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-14 18:14:35 +00:00
Aurelien Jacobs
c0f716b86f fix display of theora videos with visible size smaller than encoded size 
Originally committed as revision 8928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-07 15:43:01 +00:00
Matthieu Castet
116d866ca5 fix playback of theora.ogg on mphq patch by (matthieu castet %% castet dat matthieu ot free dat fr %%) 
Originally committed as revision 5776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-17 10:44:53 +00:00
Måns Rullgård
3644cb8ff9 set stream time_base properly 
Originally committed as revision 5367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-12 00:50:43 +00:00
Alex Beregszaszi
571fa53105 support correct ptses on other than version 3.2.0 aswell 
Originally committed as revision 5047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-02-22 00:18:12 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting 
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace. 
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 18:14:38 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility 
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-07-17 22:24:36 +00:00
Måns Rullgård
5b558574ba check theora version 
Originally committed as revision 4229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-12 22:33:05 +00:00
Måns Rullgård
1ed923eab3 support theora in ogg, plus required ogg core changes 
Originally committed as revision 4217 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-11 16:38:34 +00:00