virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Code Issues Releases Activity
43,787 Commits 37 Branches 400 Tags 462 MiB
10c3329627
Commit Graph

33 Commits

Author SHA1 Message Date
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
9ed388f598 ogm: Fix division by 0 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-18 15:30:34 +02:00
Michael Niedermayer
f0b4a505d8 oggparseogm: fix order of arguments of avpriv_set_pts_info(). 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-22 19:51:43 +01:00
Michael Niedermayer
12c65efb41 oggparseogm: Fix order or arguments. 
Bug introduced by libav in 1bb3990b56

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-08 21:31:45 +01:00
Michael Niedermayer
268098d8b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  amrwb: remove duplicate arguments from extrapolate_isf().
  amrwb: error out early if mode is invalid.
  h264: change underread for 10bit QPEL to overread.
  matroska: check buffer size for RM-style byte reordering.
  vp8: disable mmx functions with sse/sse2 counterparts on x86-64.
  vp8: change int stride to ptrdiff_t stride.
  wma: fix invalid buffer size assumptions causing random overreads.
  Windows Media Audio Lossless decoder
  rv10/20: Fix slice overflow with checked bitstream reader.
  h263dec: Disallow width/height changing with frame threads.
  rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.
  rmdec: Honor .RMF tag size rather than assuming 18.
  g722: Fix the QMF scaling
  r3d: don't set codec timebase.
  electronicarts: set timebase for tgv video.
  electronicarts: parse the framerate for cmv video.
  ogg: don't set codec timebase
  electronicarts: don't set codec timebase
  avs: don't set codec timebase
  wavpack: Fix an integer overflow
  ...

Conflicts:
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/msmpeg4.c
	libavcodec/pnmdec.c
	libavcodec/qpeg.c
	libavcodec/rawenc.c
	libavcodec/ulti.c
	libavcodec/vcr1.c
	libavcodec/version.h
	libavcodec/wmalosslessdec.c
	libavformat/electronicarts.c
	libswscale/ppc/yuv2rgb_altivec.c
	tests/ref/acodec/g722
	tests/ref/fate/ea-cmv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-03 00:23:10 +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
Reimar Döffinger
7c8d477299 Make AAC in Ogg (ogm) work. 
This needs the extradata to be extracted.
The approach used is the one MPlayer uses, though it is
unclear whether the 4 bytes extradata that are skipped
should be skipped always or only for AAC.
The AAC parser must be disabled, too, otherwise playback
still does not work.
Fixes trac issue #547.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-02-18 12:04:14 +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
Mans Rullgard
e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +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
3477897e5a oggdec: Set packet duration for ogm streams 
Originally committed as revision 22493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-13 05:55:57 +00:00
David Conrad
2e5085854c oggdec: Cosmetics 
Originally committed as revision 22476 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:54 +00:00
David Conrad
d8ba748359 oggdec: Read ogm metadata 
Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-03-12 05:16:51 +00:00
David Conrad
5e15c7d95b Fix PTS for OGM codecs. 
Fixes issue251

Originally committed as revision 20815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-12-12 20:18:43 +00:00
Daniel Verkamp
1a40491ef2 Add ff_ prefixes to exported symbols in libavformat/riff.h. 
patch by Daniel Verkamp, aniel drv nu

Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-06-22 23:09:34 +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
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
Justin Ruggles
b2677aa2a1 parse audio in ogm demuxer. 
fixes issue165.

Originally committed as revision 13407 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 00:45:02 +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
73965d1b96 const 
Originally committed as revision 11763 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-01 15:17:43 +00:00
Reimar Döffinger
2331e31c23 Add support for ogg text subtitles. 
Originally committed as revision 11698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-01-31 22:30:55 +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
Måns Rullgård
6927c84c82 ogm: don't use deprecated codec_get_{bmp,wav}_id() 
Originally committed as revision 9529 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 01:41:09 +00:00
Måns Rullgård
78c3c1881f use bytestream_get_* and AV_RLxx 
Originally committed as revision 9525 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-07 20:50:31 +00:00
Måns Rullgård
9d9f4119bd move common stuff from avienc.c and wav.c to new file riff.c 
Originally committed as revision 5720 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-12 00:09:34 +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
Måns Rullgård
e1203ac098 ogm demuxing 
Originally committed as revision 5365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-11 23:07:22 +00:00