virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
22,049 Commits 37 Branches 400 Tags 464 MiB
2edabfdfdb
Commit Graph

134 Commits

Author SHA1 Message Date
Ben Littler
c26436ec46 add amr in avi riff tags 
Originally committed as revision 16303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-24 02:20:07 +00:00
Carl Eugen Hoyos
9f2ace74ef Fix two identical warnings when compiling riff.c and nuv.c with icc: 
warning #188: enumerated type mixed with another type

Originally committed as revision 16281 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-22 22:12:44 +00:00
Ben Littler
f86cd76138 add MPNG fourcc 
fixes http://sceneish.ath.cx/stuff/netmap/netmap.avi

Originally committed as revision 16163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:22:53 +00:00
Ben Littler
4a49a5fdfc two more mpeg4 fourccs and one msmpeg4v3 from uncommon codec list 
Originally committed as revision 16162 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 05:20:11 +00:00
Ben Littler
a9cf309b96 QIVG fourcc, fixes http://rodweb.dip.jp/partner/check.avi 
Originally committed as revision 16161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:49:26 +00:00
Ben Littler
c6340f86a3 add rpza avi fourcc 
Originally committed as revision 16160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-16 03:42:10 +00:00
Ben Littler
41b0534a7a add another mpeg4 avi fourcc from uncommon codecs list 
Originally committed as revision 16079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-12 15:34:55 +00:00
Mike Melanson
65fec2d98f add 'ACDV' FourCC (which is just complete JPEG files in individual AVI 
frames) and 'azpr' FourCC (which is Apple's 'rpza', encapsulated in AVI
instead)

Originally committed as revision 16052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 07:49:05 +00:00
Ben Littler
6cffaea8db add mpeg2 fourcc and aac format tag from asf 
Originally committed as revision 16036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-08 20:09:15 +00:00
Ben Littler
62d6f73edc add VX1K h263 and DMK2 mpeg4 avi fourccs 
Originally committed as revision 16009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-05 14:59:41 +00:00
Ben Littler
26e8d342c0 add fourccs from avi files 
Originally committed as revision 15995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 21:44:29 +00:00
Michael Niedermayer
b8cf645bd2 add GEOX fourcc for mpeg4 
Originally committed as revision 15992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 16:49:58 +00:00
Ben Littler
26ae363e06 add FFDS fourcc, ok'd by kostya 
fixes FFDS files in http://tranquillity.ath.cx/uncommon_video_codecs_final.txt

Originally committed as revision 15989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-03 13:53:13 +00:00
Peter Ross
4fd71a0ee8 Decode audio channel layout from RIFF/WAV file format. 
Originally committed as revision 15774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-11-05 09:22:13 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead. 
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-10-03 10:16:29 +00:00
Benjamin Larsson
faeedbbb06 Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work 
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-26 10:59:42 +00:00
Kostya Shishkov
b30cb420cf Add fourcc for MS RLE4 
Originally committed as revision 15357 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-18 05:25:29 +00:00
Luca Abeni
dd1c8f3e6e Bump Major version, this commit is almost just renaming bits_per_sample to 
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!

Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-08 14:24:59 +00:00
Baptiste Coudurier
24b8aa84d0 set default bps to 16 in wav header 
Originally committed as revision 15239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-07 04:17:15 +00:00
Baptiste Coudurier
235a51ad31 simplify bps code by using av_get_bits_per_sample 
Originally committed as revision 15215 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-05 02:20:33 +00:00
Baptiste Coudurier
52cf395407 Fix msgsm in wav, do not set blkalign to frame size, this is wrong, 
all samples have correct blkalign set to 65

Originally committed as revision 15209 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 23:19:53 +00:00
Peter Ross
57406d8eb8 Make RIFF-based demuxers handle F32LE and F64LE PCM audio. 
Originally committed as revision 14835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-19 10:54:30 +00:00
Benjamin Larsson
1b46683c80 FOURCC addition: added 3IV2, another mpeg4 id. incoming/video_3iv2/video_3iv2.avi 
Originally committed as revision 14681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-10 15:34:29 +00:00
Peter Ross
4e0e6888a4 Support muxing of Zork PCM audio into RIFF formats. 
Originally committed as revision 14617 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-08-05 10:38:25 +00:00
Anuradha Suraparaju
eb64714c3a Add entry for Dirac codec. 
Patch by Anuradha Suraparaju anuradha rd bbc co uk

Originally committed as revision 14151 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-07-10 11:41:06 +00:00
Michael Niedermayer
c8b9377d15 Make ac3 in avi work better. 
fixes issue355.

Originally committed as revision 13406 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-05-26 00:05:30 +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
Aurelien Jacobs
b847847a0c cosmetics: remove some empty lines 
Originally committed as revision 12404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 00:48:36 +00:00
Aurelien Jacobs
01ccf45b92 remove useless and misleading comments 
Originally committed as revision 12403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-10 00:45:25 +00:00
Aurelien Jacobs
36b0782e71 consistent use of MKTAG() in the codec_bmp_tags table 
Originally committed as revision 12401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:43:55 +00:00
Aurelien Jacobs
ab0b2e559a cosmetics: alignment of the codec_bmp_tags table 
Originally committed as revision 12400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 23:34:14 +00:00
Mike Melanson
d98878f423 recognize the CLJR FourCC (Cirrus Logic AccuPak) 
Originally committed as revision 12391 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-09 04:18:48 +00:00
Michael Niedermayer
a7805e2983 Fallback to sample rate if bit rate is 0. This avoids 0 timebases in nut. 
Originally committed as revision 12294 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-03-02 23:47:30 +00:00
Michael Niedermayer
2401daaf39 add cdvc 
(from a patch by Dmitry Vassiliev // slydiman mail ru)

Originally committed as revision 12279 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-29 11:41:57 +00:00
Benjamin Larsson
800b9c24b7 Add more riff IDs to support remuxing. 
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-27 20:34:44 +00:00
Diego Biurrun
8af9090f4f cosmetics: Sort and prettyprint codec_wav_tags[]. 
Originally committed as revision 12192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-24 23:02:47 +00:00
Benjamin Larsson
7bb8d51c1f Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers. 
Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-23 23:30:41 +00:00
Christophe Lorenz
23ef05756e Add dv50 tag to support samples with dv50 fourcc in AVI. 
patch by christophelorenz  christophelorenz gmail com

Originally committed as revision 11859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-02-04 12:18:00 +00:00
Baptiste Coudurier
32bbb99d0a HDYC fourcc, sample hdyc/Test2.avi 
Originally committed as revision 10541 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-21 18:23:46 +00:00
Aurelien Jacobs
6369638bf0 loosen dependencies over allformats.h 
Originally committed as revision 10513 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-09-16 23:00:44 +00:00
Michael Niedermayer
a11c2a2c66 support silly PCM variant used by zork nemesis 
fixes audio decoding of T000A11C.AVI

Originally committed as revision 9831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-30 02:05:16 +00:00
Michael Niedermayer
8950f82879 detect voxware (closes issue39) 
Originally committed as revision 9809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-27 11:37:56 +00:00
Aurelien Jacobs
45da8124a0 Move public API functions av_codec_get_tag() and av_codec_get_id() 
into a file which is compiled un-conditionally (utils.c).

Originally committed as revision 9590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-11 12:45:14 +00:00
Måns Rullgård
b3633dee58 remove deprecated codec_get_{bmp,wav}_{id,tag}() 
Originally committed as revision 9530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-07-08 01:49:24 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes 
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-12 09:29:25 +00:00
Baptiste Coudurier
e5f0be5a0c add MMES fourcc, matrox mpeg2 in avi files 
Originally committed as revision 9234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-06-06 15:52:53 +00:00
Michael Niedermayer
fc1f90d4e9 move jpegls up, fixes sf bug #1629152 
Originally committed as revision 9165 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-05-30 23:42:37 +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
91aeec1bc7 WMVA 
Originally committed as revision 8581 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-04-01 01:09:56 +00:00
Baptiste Coudurier
beef9ba9e2 add AVRn fourcc 
Originally committed as revision 8572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-31 16:27:22 +00:00
Baptiste Coudurier
bad0cefbdd add IJPG fourcc, to play m_ijpg.avi 
Originally committed as revision 8530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-26 18:41:12 +00:00
Bobby Bingham
2c0c00cb14 Targa (.tga) encoder, 
patch by Bobby Bingham % uhmmmm A gmail P com %
Only handles 24-bit BGR and 8-bit grayscale, no RLE at the moment either.
Original thread:
Date: Mar 11, 2007 7:58 PM
Subject: [Ffmpeg-devel] [PATCH] Targa encoder

Originally committed as revision 8411 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-15 12:23:08 +00:00
Michael Niedermayer
140fba0985 jpeg fourcc 
Originally committed as revision 8310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-03-10 11:30:48 +00:00
Michael Niedermayer
0a3692cd82 be less noisy 
Originally committed as revision 8107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-24 01:51:37 +00:00
Michael Niedermayer
9376710d06 warn if bps from user and what will be stored missmatches 
Originally committed as revision 8044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 16:20:08 +00:00
Michel Bardiaux
5b77a81a8d Remove code duplicated between adpcm.c and riff.c 
Originally committed as revision 8042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 14:31:43 +00:00
Michel Bardiaux
346a655d46 Add support for MS-GSM codec 
Originally committed as revision 8039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-02-20 11:09:47 +00:00
Baptiste Coudurier
72fd40bd3a add waveformatextensible support 
Originally committed as revision 7714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-25 21:56:06 +00:00
Michael Niedermayer
bb85077fc9 remove now useless codec_tag setting code in muxers 
Originally committed as revision 7603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 12:44:58 +00:00
Michael Niedermayer
6c77805fc8 get rid of the [4] limitation of codec tag lists 
Originally committed as revision 7596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 12:08:31 +00:00
Michael Niedermayer
7caf0cc62c add codec_id <-> codec_tag tables to AVIn/OutputFormat 
Originally committed as revision 7593 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2007-01-21 01:39:17 +00:00
Aurelien Jacobs
9110a0e32d Add support for VP60 and VP61. 
Originally committed as revision 7329 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-12-17 22:00:12 +00:00
Michael Niedermayer
7b24f9b425 libnut uses "MP3 " for mp3 
Originally committed as revision 6963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-11 00:29:49 +00:00
Baptiste Coudurier
cbee7a6944 get rid of CODEC_ID_MPEG4AAC after next version bump, and change it to CODEC_ID_AAC where used 
Originally committed as revision 6954 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-09 11:37:30 +00:00
Diego Biurrun
171b361e01 Remove illegal FourCC values. 
Originally committed as revision 6941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-11-08 10:48:15 +00:00
Kostya Shishkov
84ed36da85 IMC decoder 
Originally committed as revision 6839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-30 13:48:48 +00:00
Diego Biurrun
39051d5d6e Replace FLAC FourCC by TwoCC. 
Originally committed as revision 6708 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-16 11:18:26 +00:00
Diego Biurrun
6ae177aa3b Add a note about illegal codec IDs. 
Originally committed as revision 6681 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-13 00:02:33 +00:00
Diego Biurrun
7e547cb4c3 Add codec ID for Shorten audio. 
Originally committed as revision 6680 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-13 00:01:25 +00:00
Yong
104f8c10b8 Add fourccs for Wavpak and TTA 
Patch by yong ||| y0ngc |a| yahoo dot com |||

Originally committed as revision 6579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-07 18:30:41 +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
Michael Niedermayer
4b1a1a2a69 flac fourcc (fixes mplayer -demuxer 35 with flac) 
Originally committed as revision 6569 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-06 18:36:58 +00:00
Michael Niedermayer
92eb82325e prevent >16bit tags to be truncated and used in creating .wav files 
Originally committed as revision 6568 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-10-06 18:20:40 +00:00
Philippe De Muyter
3c61983828 add support for grayscale rawvideo avi 
patch by Philippe De Muyter %phdm A macqel P be%
Original thread:
Date: Sep 15, 2006 10:18 AM
Subject: [Ffmpeg-devel] [PATCH] ffmpeg does not recognize his own grayscale rawvideo avi's

Originally committed as revision 6255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-15 09:42:51 +00:00
Aurelien Jacobs
aa8f4cee32 add a VP6F fourcc for apps which rely on fourcc 
Originally committed as revision 6232 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-12 00:06:44 +00:00
Aurelien Jacobs
5ce117c37c VP5 and VP6 video decoder 
Originally committed as revision 6213 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-09 17:19:37 +00:00
Javier Garcia
af5ba08e83 Allow RGB Raw encoding 
Patch by Javier garcia % garcofra A hotmail P com %
Original thread:
Date: Aug 30, 2006 1:49 PM
Subject: [Ffmpeg-devel] [PATCH] RGB Raw ecoding

Originally committed as revision 6180 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-06 09:00:11 +00:00
Kostya Shishkov
eb57c88973 VMware Video decoder (fourcc: VMnc) 
Originally committed as revision 6171 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-05 04:37:14 +00:00
Kostya Shishkov
04ae12e91b WVC1 is now decodeable with VC-1 decoder. 
Originally committed as revision 6163 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-09-04 04:25:47 +00:00
Baptiste Coudurier
f31065f6e5 add codec id and tag for JPEG 2000 
Originally committed as revision 6076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-24 14:13:57 +00:00
Steve L'Homme
0b23d689d8 Add YV12 support, patch by Steve Lhomme % steve P lhomme A free P fr % 
Original thread:
Date: Aug 17, 2006 5:45 PM
Subject: Re: [Ffmpeg-devel] [PATCH] AVISynth support

Originally committed as revision 6018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-18 07:55:08 +00:00
David Conrad
8331891957 Support AAC audio in AVI with tag 0xff 
Patch by David Conrad ( davedc_ | umbc edu )

Originally committed as revision 5963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-08-08 22:16:34 +00:00
Stefan Gehrer
67630cff64 add new tag 'CAVS' for Chinese AVS codec 
Originally committed as revision 5847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2006-07-29 08:50:29 +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