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
76,456 Commits 37 Branches 400 Tags 458 MiB
92e483f8ed
Commit Graph

70 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
479fb7b8af Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  fix space type in Changelog
  ZeroCodec Decoder
  RealAudio Lossless decoder
  rtpenc: Use AVFormatContext.packet_size instead of a private option
  url: Document the expected behaviour of url_read
  libavformat: Use AVFormatContext.probesize in init_input
  docs: Fix a stray reference to tags in the generic doxy on dicts
  cosmetics: Align some AVInput/OutputFormat declarations
  zmbv: check decompress result
  zmbv: correct indentation
  adpcm: convert adpcm_thp to bytestream2.
  adpcm: convert adpcm_yamaha to bytestream2.
  adpcm: convert adpcm_swf to bytestream2.
  adpcm: convert adpcm_sbpro to bytestream2.
  adpcm: convert adpcm_ct to bytestream2.
  adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
  adpcm: convert adpcm_ea_xas to bytestream2.
  adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
  adpcm: convert ea_maxis_xa to bytestream2.
  adpcm: convert adpcm_ea to bytestream2.
  ...

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/adpcm.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavcodec/zmbv.c
	libavformat/riff.c
	libavformat/url.h
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 00:03:19 +01:00
Kostya Shishkov
b8560637d9 RealAudio Lossless decoder 2012-03-19 18:46:34 +01:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Francesco Lavra
74e8ccad4c Move rm_codec_tags to rm.c so muxer/demuxer can share it. 
Patch by Francesco Lavra <francescolavra interfree it>.

Originally committed as revision 23360 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-05-28 18:18:33 +00:00
Reimar Döffinger
88e70e1b0a ff_rm_metadata is const. 
Originally committed as revision 19786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-06 08:57:19 +00:00
Aurelien Jacobs
7379d5bc0b use new metadata API in rm (de)muxer 
Originally committed as revision 17396 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-17 21:40:38 +00:00
Aurelien Jacobs
7b2a2ce556 split rm muxer and demuxer in their own files 
Originally committed as revision 9156 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-30 09:44:16 +00:00
Benjamin Larsson
10e26bc782 Atrac3 decoder. 
Originally committed as revision 8747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-17 20:53:39 +00:00
Michael Niedermayer
87e8788680 allocate 32 extra bytes at the end of the probe buffer and remove most probe buf_size checks 
Originally committed as revision 8677 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-08 11:34:15 +00:00
Sam Hocevar
d495fdc3d3 Do not return invalid pointer for non-audio or video streams. 
Patch by Sam Hocevar sam+ffmpeg zoy org

Originally committed as revision 8564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-30 23:04:45 +00:00
Steve L'Homme
949b1a13bf Replace most of the %lld and %llx by their (cleaner) PRI*64 counterparts. 
patch by Steve Lhomme, slhomme divxcorp com

Originally committed as revision 6868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 22:39:58 +00:00
Steve L'Homme
e344c1ea36 reindentation, patch by From: Steve Lhomme, slhomme divxcorp com 
Originally committed as revision 6864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-01 21:09:14 +00:00
Aurelien Jacobs
7fbde3431a replace coder/decoder file description in libavformat by muxer/demuxer 
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-23 08:57:54 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library' 
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 15:30:46 +00:00
Diego Biurrun
36c32bdddf Remove unused variables and the corresponding warnings along with them. 
Originally committed as revision 6536 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-03 17:12:48 +00:00
Michael Niedermayer
cb37931d78 dont set sub_id as its completly redundant and silly 
Originally committed as revision 6393 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-30 11:50:03 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers 
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names 
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-09 23:40:53 +00:00
Roberto Togni
a9d4a6ef34 rm_read_audio_stream_info return type is not void 
Check for errors returned by rm_read_audio_stream_info
Check for overflow in aac extradata allocation

Originally committed as revision 5455 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-04 21:01:02 +00:00
Roberto Togni
a194f595c8 Support for AAC (fourcc raac and racp) in rm files 
Originally committed as revision 5454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-06-04 17:26:58 +00:00
Michael Niedermayer
a443a2530d sanity checks some might have been exploitable 
Originally committed as revision 5370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-05-13 11:37:56 +00:00
Michael Niedermayer
30a43f2d09 add size to AVIndex 
Originally committed as revision 5083 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-03-01 11:29:55 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address. 
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-01-12 22:43:26 +00:00
Roberto Togni
c69e7914be Support for 28_8 in old ar. files 
Originally committed as revision 4772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-25 00:48: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
Roberto Togni
1e4668d160 Fix for Real "old" files version 3 with no 4cc. Fixes thankyou144.ra 
Based on patch by "mkhodor7 <-> yahoo | com"

Originally committed as revision 4759 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-19 20:49:00 +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
Jindřich Makovička
d76319b1ab malloc padding to avoid reading past the malloc()ed area. 
Credits to Mikulas Patocka (mikulas at artax karlin mff cuni cz)

Originally committed as revision 4748 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-17 17:57:03 +00:00
Benjamin Larsson
e0f7e32970 Cook compatibe decoder, patch by Benjamin Larsson 
Add cook demucing, change rm demuxer so that it reorders audio packets
before sending them to the decoder, and send minimum decodeable sized
packets; pass only real codec extradata fo the decoder
Fix 28_8 decoder for the new demuxer strategy

Originally committed as revision 4726 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-12-09 16:08:18 +00:00
Diego Biurrun
a9e3509529 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS 
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.

Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-09-23 00:25:41 +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
Michael Niedermayer
2692067a45 AVPacket.pos 
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-05-26 20:17:12 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases 
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-30 21:43:59 +00:00
Michael Niedermayer
9786bd4d94 fixing broken_rv20_1mb_.rm 
Originally committed as revision 4155 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-04-24 22:08:31 +00:00
Michael Niedermayer
f3356e9c9e more fine grained discarding of packets 
Originally committed as revision 4051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-03-17 01:25:01 +00:00
Michael Niedermayer
386b26c9fe set block align 
Originally committed as revision 3993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-28 03:16:13 +00:00
Michael Niedermayer
72aef1987e ra288 demuxing support (doesnt really work, might be demuxer or decoder bug) 
Originally committed as revision 3992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-02-28 02:51:53 +00:00
Michael Niedermayer
b9866ebcc7 support discarding uninterresting packets 
Originally committed as revision 3860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-22 13:36:02 +00:00
Michael Niedermayer
3f05305d73 RV30/RV40 demuxing (untested) 
Originally committed as revision 3809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-06 00:54:03 +00:00
Michael Niedermayer
119cebf429 skip INDX chunks 
Originally committed as revision 3796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2005-01-03 02:52:11 +00:00
Michael Niedermayer
d0271e8a3a rv20 encoding 
Originally committed as revision 3739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-07 13:14:37 +00:00
Michael Niedermayer
37e85dacd0 seeking in rm 2nd try 
Originally committed as revision 3738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 23:43:28 +00:00
Michael Niedermayer
bc17df09d4 seeking in rm 
Originally committed as revision 3737 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 22:44:03 +00:00
Michael Niedermayer
80016c48b0 rm encoding fix 
Originally committed as revision 3736 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 21:38:05 +00:00
Michael Niedermayer
012cd15fc4 try to recover from errors instead of failing fataly 
Originally committed as revision 3735 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 20:03:42 +00:00
Michael Niedermayer
a8b81ec199 various demuxer fixes 
Originally committed as revision 3734 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 18:57:59 +00:00
Michael Niedermayer
18ade9543f rv10 thread safety fix / rv10 ffplay fix 
Originally committed as revision 3733 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 17:21:17 +00:00
Michael Niedermayer
d880240e18 timestamp fix 
Originally committed as revision 3732 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2004-12-06 16:40:10 +00:00