1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

95 Commits

Author SHA1 Message Date
Alex Beregszaszi
964ff35445 Prefer ADPM_SWF instead NONE if no MP3 encoding is compiled in.
Originally committed as revision 11042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-15 23:53:19 +00:00
Michael Niedermayer
ec62727818 indent
Originally committed as revision 10693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-09 01:12:27 +00:00
Michael Niedermayer
4838727ea0 avoid generating invalid files
fixes issue213

Originally committed as revision 10692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-09 01:01:07 +00:00
Michael Niedermayer
f683dbdc6a set the previous tag size correctly in flv files
Originally committed as revision 9919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-04 23:03:17 +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
Benjamin Larsson
e9509536a9 Set FLV_SAMPLESSIZE_16BIT for ADPCM.
Originally committed as revision 8201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 09:16:38 +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
edb6e50682 export a few more codec_tag-codec_id tables
Originally committed as revision 7594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 02:12:34 +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
Diego Biurrun
6ebe07fbb5 variable renaming: mp3lame --> libmp3lame
Originally committed as revision 7417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-07 00:02:15 +00:00
Benjamin Larsson
09d8c0ae83 VP6 and flashsv stream copy and muxing support.
Originally committed as revision 7399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-01 22:52:22 +00:00
Allan Hsu
148c9bdbb8 Patch for the FLV muxer to supply more complete metadata
in the onMetaData header. Patch by Allan Hsu <allan at counterpop dot net>.

Originally committed as revision 7382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-28 12:35:22 +00:00
Michael Niedermayer
c45388b193 set flags correctly in write header instead of seeking back and fixing it in write_trailer()
Originally committed as revision 7267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-10 17:12:45 +00:00
Allan Hsu
6cac3a3b08 Defines various common FLV format values between the FLV muxer and demuxer
in a common flv.h.
patch by Allan Hsu  allan _at_ counterpop.net

Originally committed as revision 7231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 00:23:04 +00:00
Allan Hsu
56cca5f10c Fix wrong flags for S16LE and S16BE audio in FLV files.
patch by Allan Hsu, allan counterpop net

Originally committed as revision 7194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-01 10:26:54 +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
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
Baptiste Coudurier
634b8cfaf4 always write duration and file size, fix seeking, progress bar is now active
Originally committed as revision 5939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-06 15:29:50 +00:00
Michael Niedermayer
fd0fb3064d add header info to flv format based on a patch by (Philipp Klaus >ffmpegdevel ad pylonsoft mot ch )
Originally committed as revision 5779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-17 21:51:21 +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
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
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
Alex Beregszaszi
2fde8aaeba support transcoding adpcm
Originally committed as revision 4689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-11-12 20:01:23 +00:00
Michael Niedermayer
a254c5745b kill duplicated get/put_be24()
Originally committed as revision 4460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-19 14:41:08 +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
e817a73daa fix mimetype
Originally committed as revision 4234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-13 12:09:45 +00:00
Alex Beregszaszi
2f5132e7a8 proper handling of samplesize
Originally committed as revision 3980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-25 11:15:12 +00:00
Alex Beregszaszi
923bd441fe correct pcm in flv handling
Originally committed as revision 3968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-21 18:05:21 +00:00
Michael Niedermayer
37cdf93d6e assert(0) -> retunrn -1
Originally committed as revision 3285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-02 19:26:51 +00:00
Michael Niedermayer
75293f05f9 simplify
Originally committed as revision 3252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-25 20:03:51 +00:00
Michael Niedermayer
e928649b0b pass AVPacket into av_write_frame()
fixes the random dts/pts during encoding
asf preroll fix
no more initial zero frames for b frame encoding
mpeg-es dts during demuxing fixed
.ffm timestamp scale fixed, ffm is still broken though

Originally committed as revision 3168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-29 02:06:32 +00:00
Michael Niedermayer
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 20:43:21 +00:00
Michael Niedermayer
11a8e42573 various fixes
Originally committed as revision 3031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-18 15:26:57 +00:00
Michael Niedermayer
068f2a22db cleanup
fix streamcopy

Originally committed as revision 3026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-17 12:04:59 +00:00
Michael Niedermayer
92a267756f flv fixes
Originally committed as revision 2863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-09 20:14:34 +00:00
Michael Niedermayer
2d9aa1e3a2 100l
Originally committed as revision 2758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-07 04:21:05 +00:00
Tinic Uro
747a0554ea - made --extra-cflags option work on darwin
- allow INTER4V macroblocks for FLV1 codec
- fixed issue in flv file format saving 8 mp3 frames per packet instead of 1
- fixed crasher in flv file format involving mp3 buffer handling
- added FLV1 codec support for swf file format (FlashPlayer6 or above
required) and made it default
- fixed broken mp3 support in swf file format
patch by (Tinic Uro <turo at macromedia dot com>)
cleanup by me

Originally committed as revision 2756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-06 23:56:37 +00:00
Fabrice Bellard
490579042a 64 bit pts for writing - more const usage
Originally committed as revision 2255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 22:37:33 +00:00
Fabrice Bellard
80783dc2c2 CODEC_ID_MP3LAME is obsolete
Originally committed as revision 2232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:04:29 +00:00
Michael Niedermayer
14b3225377 Building ffmpeg with gcc-2.95.3 encountered a problem due to C99 initialization fix by ("Steven M. Schultz" <sms at 2BSD dot COM>)
Originally committed as revision 2032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-10 23:18:09 +00:00
Garrick Meeker
d4f5d74a54 flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
Originally committed as revision 2024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-09 23:10:59 +00:00