Commit Graph

250 Commits

Author SHA1 Message Date
Baptiste Coudurier
3473ca9a25 change 3gp/3g2 brands if h264 is present
Originally committed as revision 13771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:10:11 +00:00
Baptiste Coudurier
cd70d17f5f simplify ipod brand selection
Originally committed as revision 13770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:07:59 +00:00
Baptiste Coudurier
7b0fb8b77a fix warning, write_ftyp return int now
Originally committed as revision 13769 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:06:10 +00:00
Baptiste Coudurier
835790846c put avc1 brand in compat list when h264 is present
Originally committed as revision 13768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:05:28 +00:00
Michael Niedermayer
65f526835f I think we are also compliant to iso2.
Originally committed as revision 13765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 13:52:53 +00:00
Michael Niedermayer
ed6e47c21d Add isom to the compatible brands.
Originally committed as revision 13764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 12:19:01 +00:00
Michael Niedermayer
1560b66714 Calculate ftyp size instead of hardcoding it.
Originally committed as revision 13763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-13 11:30:36 +00:00
Michael Niedermayer
a04aec6d1a simplify MODE_3G2
Originally committed as revision 13755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 03:08:41 +00:00
Michael Niedermayer
2c77994fc8 Change MODE_* to 1<<c so several can be set at the same time.
Originally committed as revision 13754 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 03:08:08 +00:00
Baptiste Coudurier
ce072b2d30 cosmetics, reindent
Originally committed as revision 13752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 00:56:54 +00:00
Baptiste Coudurier
283c9a8ed4 don't write double sets of metadata in mov, only write usual ones
Originally committed as revision 13751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 00:55:49 +00:00
Baptiste Coudurier
927509e10b indent
Originally committed as revision 13747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:40:40 +00:00
Baptiste Coudurier
c6e2c6c9c6 support for 3gp metadata
Originally committed as revision 13746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:40:22 +00:00
Baptiste Coudurier
07b7b06d92 move utf8 code before udta func, will be used by 3gp tags
Originally committed as revision 13745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:35:02 +00:00
Baptiste Coudurier
c55cc074cc write usual brand for ipod format
Originally committed as revision 13744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:33:35 +00:00
Baptiste Coudurier
d32d6defee simplify
Originally committed as revision 13743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:06:27 +00:00
Baptiste Coudurier
20e22af85a factorize psp metadata
Originally committed as revision 13742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:02:01 +00:00
Baptiste Coudurier
f7635edb4d cosmetics
Originally committed as revision 13741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:50:41 +00:00
Baptiste Coudurier
c3858df291 cosmetics
Originally committed as revision 13740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:39:35 +00:00
Baptiste Coudurier
709c9f8de3 support alac in ipod m4a format, tested on quicktime
Originally committed as revision 13739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 08:17:38 +00:00
Baptiste Coudurier
ccec1b69c0 m4v/m4a are usual itunes/ipod/iphone extensions
Originally committed as revision 13737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 22:14:58 +00:00
Baptiste Coudurier
d88812a91f indent
Originally committed as revision 13736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 20:14:09 +00:00
Baptiste Coudurier
d1d87dfba0 rework udta handling, if any track set bitexact, don't write any metadata
Originally committed as revision 13735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 20:13:44 +00:00
Baptiste Coudurier
1dc7ff331a 10l, add parentheses
Originally committed as revision 13734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:58:35 +00:00
Baptiste Coudurier
cabc1a7dce indent
Originally committed as revision 13733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:56:59 +00:00
Baptiste Coudurier
b63ba850c1 remove obsolete requirements, quicktime 6 is from 2002, not sure if muxing scheme still fits
Originally committed as revision 13732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 19:56:45 +00:00
Baptiste Coudurier
0724373d2c cosmetics
Originally committed as revision 13731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 18:23:06 +00:00
Stefano Sabatini
bde15e74de Make long_names in lavf/lavdev optional depending on CONFIG_SMALL.
patch by Stefano Sabatini, stefano.sabatini-lala poste.it
along with some spelling/consistency fixes for the long names by me

Originally committed as revision 13649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 16:20:54 +00:00
Baptiste Coudurier
96f69e0d87 warn if pts is not set, prevent writing negative/weird cts, happens when using genpts and streamcopy
Originally committed as revision 13519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:58:41 +00:00
Baptiste Coudurier
c4f078ffe1 reindent
Originally committed as revision 13518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:54:33 +00:00
Baptiste Coudurier
e95580e70a this should be valid for audio too
Originally committed as revision 13517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:54:09 +00:00
Diego Biurrun
ccd425e799 Remove unnecessary parentheses from return calls.
Originally committed as revision 13069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-06 09:16:36 +00:00
Baptiste Coudurier
287d6cfad7 cosmetics: remove useless whitespaces and put braces correctly
Originally committed as revision 12942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:22:39 +00:00
Baptiste Coudurier
463e7afd18 support for alac in .mov
Originally committed as revision 12938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 13:59:39 +00:00
Baptiste Coudurier
b64518e91b special mpeg2 handling is no more needed
Originally committed as revision 12685 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-04 09:55:31 +00:00
Baptiste Coudurier
b371539a3d prevent writing empty stss atom
Originally committed as revision 12636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 21:18:22 +00:00
Baptiste Coudurier
721da10aeb fix mpeg2 muxing, replace seq header if contained in extradata and key frame does not contain it
Originally committed as revision 12520 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 18:48:50 +00:00
Baptiste Coudurier
7b0f4c9aaa cosmetics, move case up
Originally committed as revision 12519 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 18:42:44 +00:00
Baptiste Coudurier
aa9f4208b6 ipod/iphone compatible mp4 muxer
Originally committed as revision 12458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 13:36:36 +00:00
Baptiste Coudurier
91208916c6 cosmetics, remove whitespaces before and after parenthesis
Originally committed as revision 11879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 18:57:00 +00:00
Michael Niedermayer
f70eccdb39 2 more missing consts found by -Wwrite-strings.
Originally committed as revision 11849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:06:04 +00:00
Baptiste Coudurier
fa7343eaf2 stupid typo
Originally committed as revision 11693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 13:40:53 +00:00
Baptiste Coudurier
ccac843872 support rawvideo in mov
Originally committed as revision 11691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 11:31:56 +00:00
Baptiste Coudurier
4ad08accb2 use context in av_log
Originally committed as revision 11668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:31 +00:00
Baptiste Coudurier
c8134d7104 warning is only valid for mov
Originally committed as revision 11667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-30 13:22:04 +00:00
Baptiste Coudurier
0b98a7b3b2 cosmetics, split long lines, remove useless braces, merge comments and if
Originally committed as revision 11656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:35:12 +00:00
Baptiste Coudurier
506e4bb8bc cosmetics, vertically align
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:33:27 +00:00
Baptiste Coudurier
bbe052463d spoke too fast, fix dv fourcc in mov accordingly if strict
Originally committed as revision 11653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:58:42 +00:00
Baptiste Coudurier
ea1664e33a finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
Originally committed as revision 11652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:03:50 +00:00
Baptiste Coudurier
d97f214435 indentation
Originally committed as revision 11651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:23:37 +00:00
Baptiste Coudurier
a23c9c4a50 correctly and only set standard stsd fourcc for mp4/3gp
Originally committed as revision 11650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:22:07 +00:00
Baptiste Coudurier
d0c0a29b5a write esds atom when mpeg-4 systems tags are used
Originally committed as revision 11649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:44:27 +00:00
Baptiste Coudurier
2c2f58c0ad document tag field
Originally committed as revision 11647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:16 +00:00
Aurelien Jacobs
9ab3f71b60 add a ff_ prefix to newly exported functions from avc.c
Originally committed as revision 11511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 23:33:32 +00:00
Aurelien Jacobs
1bd2d763d4 Move isom_write_avcc() and related functions into a separate file.
Originally committed as revision 11498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:24:55 +00:00
Aurelien Jacobs
6e6eebf919 extract isom_write_avcc into a function
Originally committed as revision 11497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:04:01 +00:00
Aurelien Jacobs
de04ad45ec Add one more parameter to avc_parse_nal_units so that it allows not to
free the input buffer.
This is required by upcoming extraction of isom_write_avcc to a function.

Originally committed as revision 11496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 01:00:04 +00:00
Aurelien Jacobs
ed7fa39c2d Check return value of avc_parse_nal_units().
Originally committed as revision 11495 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 00:47:02 +00:00
Baptiste Coudurier
b356f75d46 fix indentation
Originally committed as revision 11282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-20 09:51:11 +00:00
Baptiste Coudurier
79e42311d3 use generic 'glbl' atom if extradata is present but no specific method is known
Originally committed as revision 11272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-19 16:00:08 +00:00
Baptiste Coudurier
44fb8ebb62 fix dnxhd 720p in mov for quicktime player
Originally committed as revision 11154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-12-03 10:44:25 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Benoit Fouet
cfac9ec701 Cosmetics: indentation.
Originally committed as revision 10853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 14:22:56 +00:00
Benoit Fouet
89a0d7908b Prevent mov muxer from writing empty udta atoms.
Originally committed as revision 10852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-24 14:20:15 +00:00
Baptiste Coudurier
86161ceca1 dont write udta atom for 3gp/3g2 for now, current written atoms (ilst) are itunes specific
Originally committed as revision 10757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-16 16:40:34 +00:00
Baptiste Coudurier
00996920ed indentation
Originally committed as revision 10756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-16 15:40:57 +00:00
Baptiste Coudurier
fc4cbc1699 DNxHD (SMPTE VC-3) encoder
Originally committed as revision 10682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-08 11:27:18 +00:00
Ramiro Polla
89938d29b5 Typo
Originally committed as revision 10478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-11 23:46:46 +00:00
Måns Rullgård
4f9e995a96 kill harmless 64-bit pointer cast warning
Originally committed as revision 9539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 13:42:44 +00:00
Diego Biurrun
90b5b51eab misc typo fixes
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 18:50:50 +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
911f9b714e warn user if video codec timebase is very high
Originally committed as revision 9232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-06 13:21:50 +00:00
Aurelien Jacobs
b1b64c237f typo
Originally committed as revision 9159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 10:04:37 +00:00
Michael Niedermayer
db8f4a92c9 warn the user about the the mdhd problem
(this is of course not a good solution but its better than silently
generating invalid files, we should find a better solution)

Originally committed as revision 9153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-30 00:08:32 +00:00
Baptiste Coudurier
4f60f34a89 print and return error if output is non seekable
Originally committed as revision 9087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-21 08:33:36 +00:00
Baptiste Coudurier
e23848a49c cosmectics, use consistant and homogeneous type names for atoms
Originally committed as revision 8828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-26 11:36:05 +00:00
Baptiste Coudurier
ccba88d764 cosmectics, mov -> mp4
Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-24 15:24:36 +00:00
Baptiste Coudurier
4278662d45 treat frame_size > 1 as compressed audio
Originally committed as revision 8461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 10:03:27 +00:00
Baptiste Coudurier
10fc840c52 fix pcm u/s8 muxing
Originally committed as revision 8213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 01:56:27 +00:00
Baptiste Coudurier
2260499caf deobfuscate, clearly split mov case
Originally committed as revision 8212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-04 01:48:06 +00:00
Baptiste Coudurier
1e5f5e3b7a use common tables for mov muxer and demuxer
Originally committed as revision 8205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-03 14:55:11 +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
Alex Beregszaszi
fead30d444 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
Originally committed as revision 7587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-19 22:12:59 +00:00
Baptiste Coudurier
1aad0dfd62 remove useless sampleDuration
Originally committed as revision 7281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:31:20 +00:00
Baptiste Coudurier
b596102e7e check codec frame size directly and only for audio
Originally committed as revision 7280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:30:37 +00:00
Michael Niedermayer
79e5a53c0a utf8 title support for psp (untested)
Originally committed as revision 6939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-08 01:15:06 +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
Baptiste Coudurier
f45b744cb7 simplify
Originally committed as revision 6855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 17:56:22 +00:00
Baptiste Coudurier
aa90239fd9 mov vfr muxing
Originally committed as revision 6854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-01 17:27:39 +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
ffb512e349 move track timescale/sampleDuration init to write_header and return error if not set
Originally committed as revision 6167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-04 14:22:44 +00:00
Baptiste Coudurier
5340a0bc9c wide atom is only defined in mov, use free for mp4/3gp
Originally committed as revision 6072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 10:32:09 +00:00
Baptiste Coudurier
7228914047 set elst start time to first pts
Originally committed as revision 5981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-11 09:27:40 +00:00
Baptiste Coudurier
2c5ad5fd74 use correct tag for h263 in mov
Originally committed as revision 5953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 15:48:26 +00:00
Baptiste Coudurier
87494ea03c detailed infos about d263 atom
Originally committed as revision 5952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 15:04:15 +00:00
Baptiste Coudurier
915282e5b8 indention
Originally committed as revision 5950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:19:33 +00:00
Baptiste Coudurier
5997ed786a only set fields for mov, reserved for 3gp, mp4
Originally committed as revision 5949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:18:43 +00:00
Baptiste Coudurier
80f05e7981 sampleSize field to 16, reserved for mp4 and 3gp
Originally committed as revision 5948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:15:05 +00:00
Baptiste Coudurier
86ca5710bb mp4, 3gp field is reserved and value is 2
Originally committed as revision 5947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-07 14:11:17 +00:00