1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

290 Commits

Author SHA1 Message Date
Michael Niedermayer
2111e3f9f2 check for unparsed AMR input
Originally committed as revision 5637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 12:27:43 +00:00
Michael Niedermayer
9a39cd35b8 vbr requires version=1 and samplesize=0 per QT spec
untested, but if this doesnt work the issue is likely somewhere else, as iam just chaning the random nonsense we do to what the spec says should be done

Originally committed as revision 5636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-06 12:17:01 +00:00
Baptiste Coudurier
5cb49ca11b write exact values for audio stsd v1
Originally committed as revision 5606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-04 14:03:59 +00:00
Baptiste Coudurier
42fb414804 check only existing streams
Originally committed as revision 5521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-25 00:10:52 +00:00
Baptiste Coudurier
0aec3c5cbf simplify
Originally committed as revision 5517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-24 18:09:20 +00:00
Baptiste Coudurier
aa1c1c615a fix aac in mov for ipod
Originally committed as revision 5498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-19 11:28:28 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18 11:33:14 +00:00
Stefan Huehner
a97c1e93aa Add (mostly) const to variable and parameter declaration, where a char* was
used and 'const char*' should be, plus make some function declarations
static if they aren't used outside their declaring source file.
patch by Stefan Huehner stefan%%at%%huehner%%dot%%org

Originally committed as revision 5492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-17 15:53:23 +00:00
Baptiste Coudurier
543eebd568 fix mp3 muxing
Originally committed as revision 5472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-13 14:38:44 +00:00
Michael Niedermayer
7cf0e16f96 fixing title on PSP (0x60 != 'a') someone needs a 10x10km ascii table ...
merging some related stuff from mobilehackers

Originally committed as revision 5406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-19 01:53:59 +00:00
Michael Niedermayer
ed90d370ec dont store mov style meta tags in mp4 (fixes ffmpeg -title + gtkpod)
Originally committed as revision 5405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 23:32:42 +00:00
Michael Niedermayer
6f276720ac dont write LAVF_ID if bitexact and any meta tag is set
Originally committed as revision 5404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 23:03:16 +00:00
Michael Niedermayer
efda33957f simplify meta tag writing code
Originally committed as revision 5403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-18 22:49:27 +00:00
Baptiste Coudurier
2c95f59f06 fix avc nal parsing
Originally committed as revision 5382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-15 17:11:50 +00:00
Baptiste Coudurier
5e0c720a4e fix mulaw muxing
Originally committed as revision 5378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 23:47:29 +00:00
Baptiste Coudurier
6dd19fff4d do not write wave if not needed
Originally committed as revision 5377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 22:25:17 +00:00
Baptiste Coudurier
3a72cbd9f0 fix AMR muxing in mov
Originally committed as revision 5376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 21:00:52 +00:00
Baptiste Coudurier
fcef991a85 add pcm 24/32 le/be support
Originally committed as revision 5375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 20:05:02 +00:00
Michael Niedermayer
08db8f1846 simplify
Originally committed as revision 5374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 18:45:29 +00:00
Baptiste Coudurier
039627cf48 clean and simplify
Originally committed as revision 5373 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-13 18:01:16 +00:00
Baptiste Coudurier
b451719e07 simplify, amr.c sets frame_size to 160, and sample size is always 8000
Originally committed as revision 5359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-10 18:00:16 +00:00
Baptiste Coudurier
9c09db541e fix damr atom, needed for quicktime player
Originally committed as revision 5358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-05-10 17:56:39 +00:00
Baptiste Coudurier
98d12b09af move declaration to mov.h
Originally committed as revision 5299 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-19 10:02:41 +00:00
Baptiste Coudurier
5616f85deb clean and simplify mov_write_packet
Originally committed as revision 5289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-14 10:51:32 +00:00
Baptiste Coudurier
611fd605a3 get avcC profile and level indication from sps (from handbrake)
Originally committed as revision 5287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-14 09:54:17 +00:00
Baptiste Coudurier
18c697acce write mdat in write_header avoid check in write_packet
Originally committed as revision 5286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-13 13:21:20 +00:00
Baptiste Coudurier
32ba6fb141 dont write stss atom if keyframes only
Originally committed as revision 5284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-11 08:12:54 +00:00
Baptiste Coudurier
a336965e70 fix edts for tracks without b frames
Originally committed as revision 5282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-10 17:04:22 +00:00
Michael Niedermayer
87b041e0f0 little h.264 related hunk from diff between cvs and mobile hackerz
Originally committed as revision 5268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-04 17:44:59 +00:00
Michael Niedermayer
9e282ba382 the PSP rejects video with too high bitrates so lets claim they arent too high ...
Originally committed as revision 5267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-04 12:58:56 +00:00
Baptiste Coudurier
a3a80ddca0 use 64bit atom version if needed
Originally committed as revision 5220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-26 13:34:51 +00:00
Baptiste Coudurier
3cdc7eb474 dvcpro is 411p in fact
Originally committed as revision 5199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-22 16:49:05 +00:00
Baptiste Coudurier
c6e722e5e9 create edts atom when muxing B frames, needed to compute cts
Originally committed as revision 5151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 18:21:28 +00:00
Baptiste Coudurier
c1b8e6d8a8 do nal reformating when muxing H264, create avcc atom
Originally committed as revision 5150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-11 18:18:17 +00:00
Baptiste Coudurier
8e32161943 correct computing of DV fourcc in mov muxer
Patch by Baptiste COUDURIER, baptiste <<dot>> coudurier <<at>> smartjog <<dot>> com

Originally committed as revision 5124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-08 00:39:23 +00:00
Baptiste Coudurier
26f86eaf03 ftyp patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 19:28:35 +00:00
Baptiste Coudurier
1522767d0d compute output format before setting language patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 5093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-02 01:37:38 +00:00
Baptiste Coudurier
b4712e3c8b CTTS support patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com>)
Originally committed as revision 5051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-22 23:46:20 +00:00
Baptiste Coudurier
e60b4ced1f mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 4982 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-02-11 18:27:57 +00:00
Benjamin Larsson
dcfdb046ee Fix for title field in PSP compatible mp4 files. Patch by
Olivier, oandrieu <at> gmail.com.

Originally committed as revision 4889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-24 08:03:42 +00:00
Benjamin Larsson
ed06cf6d1d gcc 2.95 fix
Originally committed as revision 4887 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-23 14:28:50 +00:00
Michael Niedermayer
b29af723de >4gb fixes by (Dirk Musfeldt | d.musfeldt meilenstein de)
Originally committed as revision 4886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-23 14:12:03 +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
François Revol
ab561df995 finally found what those >138 codes were... crappy compressed 5bit ascii. this gets them correctly, and adds setting track lang in movenc too.
Originally committed as revision 4792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-30 20:34:08 +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
Måns Rullgård
79396ac685 Kill some compiler warnings. Compiled code verified identical after changes.
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-06 21:25:35 +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
Jan Kratochvil
11bec29441 AMR-WB for 3GPP patch by (Jan Kratochvil - kratochvil) / bugreport #1187101
Originally committed as revision 4427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-10 00:38:46 +00:00
Erik Slagter
0c1e0bab66 This trivial patch adds "avc1" as fourcc for h264 in mp4, which makes it
a little bit more standard, although it still seems to lack some
metadata. Anyway, recent mplayer plays these streams without problems.

It also has two globally scoped global structs changed to "static".
patch by (Erik Slagter <erik slagter name)

Originally committed as revision 4386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-19 23:45:54 +00:00
Nico Sabbi
5cad192d50 according to the standard the object_type for H264 is 33, not 241
Originally committed as revision 4323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-30 17:32:02 +00:00
Michael Niedermayer
83fa2ef8cb round duration up in mov
Originally committed as revision 4242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-14 19:48:32 +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
ced225a762 fix psp muxing (probably this fix is wrong but its better then nothing)
Originally committed as revision 4086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-27 00:16:17 +00:00
Calcium
c64d476ccd 30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
Originally committed as revision 4072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 12:52:24 +00:00
Michael Niedermayer
8272de4ea2 fix time stored in mov
based upon 23_fix_timestamp_in_mov.patch by (Calcium | calcium nurs or jp)

Originally committed as revision 4067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 11:15:45 +00:00
Michael Niedermayer
6c13c880fa trying to fix a few minor values in the mp4/mov muxer
Originally committed as revision 4063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-23 00:26:43 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
tjraivio@cc.hut.fi
8536ab8964 quick patch for adding 3g2 support to ffmpeg (muxer and demuxer). No movie fragment support yet patch by (tjraivio cc.hut fi)
Originally committed as revision 3959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-16 23:14:38 +00:00
Michael Niedermayer
0078e9b9c5 nonsense comment
Originally committed as revision 3958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-16 23:11:11 +00:00
François Revol
0c716ab71d fix segfault by matthieu castet <castet DOT matthieu AT free DOT fr>
Originally committed as revision 3896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-28 12:13:53 +00:00
François Revol
25cf9062ba don't crash on null codec; by matthieu castet <castet DOT matthieu AT free DOT fr>
Originally committed as revision 3894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-28 11:19:47 +00:00
François Revol
46103f6bbd fix the patch to allow Sony PSP MP4 creation
Originally committed as revision 3893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-28 08:08:42 +00:00
Roine Gustafsson
501866a1fa movenc illegal access patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
Originally committed as revision 3891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-27 15:41:03 +00:00
tjcannell@blueyonder.co.uk
8af1815481 Sony PSP variation of MP4 patch by <tjcannell AT blueyonder DOT co DOT uk>
Originally committed as revision 3889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-27 14:48:15 +00:00
Roine Gustafsson
53ffdd1434 mov header field and compressor name patch by Roine Gustafsson <roine AT users DOT sourceforge DOT net>
Originally committed as revision 3885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-26 09:31:49 +00:00
Roine Gustafsson
caacd4deea add -vtag and-atag support to mov patch by (Roine Gustafsson <roine at users sourceforge net>)
Originally committed as revision 3756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-17 19:23:53 +00:00
Patrice Bensoussan
b6c50eb17c iTunes metadata encoding support patch by (Patrice Bensoussan <patrice.bensoussan at free dot fr>)
Originally committed as revision 3388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-08-14 14:05:48 +00:00
Gildas Bazin
ef19c7eb3f AAC in mov/mp4 patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 3359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-28 09:40:59 +00:00
Michael Niedermayer
ffdd57d47e warn user if ms style codec tag is used
remove "    " codec tag

Originally committed as revision 3307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-13 20:59:29 +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
75553f825c bit-exact
Originally committed as revision 3007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-12 20:06:23 +00:00
Alex Beregszaszi
21f52609dd support for -timestamp
Originally committed as revision 2978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-07 14:00:16 +00:00
Alex Beregszaszi
8cc7a34dd0 support for wider range of codecs
Originally committed as revision 2973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-07 12:47:33 +00:00
Roman Shaposhnik
906b578f16 * fixing 10l in movenc.c + updating regression patterns.
Originally committed as revision 2938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-28 03:29:00 +00:00
Roman Shaposhnik
9a4d938874 * making .mov files generated by ffmpeg compatible with Apple software.
Originally committed as revision 2937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-28 02:17:06 +00:00
Roman Shaposhnik
ca20f118d1 * enabling DV-in-QT
* fixing a bug in movenc.c: for QT files hdrl should contain 'mhlr'

Originally committed as revision 2928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 09:04:06 +00:00
Falk Hüffner
7906085fcc warning patrol
Originally committed as revision 2925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-24 23:32:48 +00:00
Michael Niedermayer
4bfc029f83 10l (1 vs. descrLength(1)) found by (Jean Le Feuvre - jeanlf)
Originally committed as revision 2864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-09 21:54:25 +00:00
Gildas Bazin
69dde1ad36 AAC support in mov, correct aspect ratio support and user data support patch by (Gildas Bazin <gbazin at altern dot org>)
and regression test checksum update for it by me

Originally committed as revision 2787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-14 19:08:09 +00:00
Gildas Bazin
ec7d0d2e9e memleak patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 2678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-08 19:01:16 +00:00
Michael Niedermayer
dd0003fa3d removing borderline spyware
Originally committed as revision 2478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-04 12:55:26 +00:00
Gildas Bazin
e45ccf79be movenc patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 2476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-03 21:51:07 +00:00
Dan Christiansen
4cb3f3b637 Using the extension m4a for audio only MPEG-4 files is increasingly
common, especially since Apple iTunes treats files with the two
extensions differently. Without the patch, FFmpeg won't know that m4a
is for MPEG-4 files
patch by (Dan Christiansen <danchr at daimi dot au dot dk>)

Originally committed as revision 2398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-19 20:57:47 +00:00
Thomas Raivio
f578f93838 mov/mp4/3gp muxer improvements patch by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
Originally committed as revision 2314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-28 21:09:32 +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
Michael Niedermayer
2187d9482e theres no SVQ1 encoder -> it cant be default
Originally committed as revision 2252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-10 10:46:50 +00:00
Michael Niedermayer
6e6d6dc0a5 mov/mp4 muxer cleanup (mostly cosmetics/simplifications & global header fix)
Originally committed as revision 2249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-09 23:03:04 +00:00
Mike Melanson
1a31840cea naughty, forbidden variable declarations
Originally committed as revision 2171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-27 01:26:14 +00:00
Michael Niedermayer
1cb5f7fd41 mov, 3gp, mp4 muxer by (Thomas Raivio <tjraivio at cc dot hut dot fi>)
Originally committed as revision 2168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-26 20:23:13 +00:00