74ccc66099
change track timescale to unsigned int, fix warning
...
Originally committed as revision 20651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:41:48 +00:00
7506e117db
track time can be 64bit
...
Originally committed as revision 20650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:40:27 +00:00
7c4b7d0f41
support pcm_f32/64le in mov
...
Originally committed as revision 20649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:27:08 +00:00
ba7c0ece61
cosmetics, reindent after last commit
...
Originally committed as revision 20648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:04:44 +00:00
feaa8d110d
support sample rates > INT16_MAX in mov using stsd v2
...
Originally committed as revision 20647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:03:24 +00:00
7382902b86
MOV: Add several iTunes metadata tags
...
Originally committed as revision 20586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:44 +00:00
620af1a17a
MOV: Fix writing \251wrt metadata (r20453 only fixed the demuxer)
...
Originally committed as revision 20585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:40 +00:00
aca857ecd3
Do not write an extra byte in the iTunes 'hdlr' tag. The files on iTMS have an
...
extra byte and are not compliant with ISO 14496-12. This causes some strict
demuxers (notably the MPEG-4 ALS reference software) to fail. It has been
confirmed that not writing the extra byte will still allow the generated MP4
files to work with QuickTime/iTunes/iPod.
Originally committed as revision 20571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-22 02:07:10 +00:00
1a40491ef2
Add ff_ prefixes to exported symbols in libavformat/riff.h.
...
patch by Daniel Verkamp, aniel drv nu
Originally committed as revision 19254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-22 23:09:34 +00:00
15c315b7f1
fix 3gp metadata, write strings in UTF8, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
...
Originally committed as revision 19023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 05:24:16 +00:00
606d48cee1
fix hdlr descr in mp4 which use c string, patch by Larbi Joubala, larbi dot joubala at resonate-mp4 dot com
...
Originally committed as revision 18911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-23 07:17:17 +00:00
e1316b19ea
write 'stps' for mpeg-2 open gop in .mov
...
Originally committed as revision 18838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-15 06:11:53 +00:00
ab4752e382
use flags field and remove key_frame field
...
Originally committed as revision 18831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 21:05:52 +00:00
fe335ff530
change cts type to int, save some space
...
Originally committed as revision 18830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 20:54:19 +00:00
3a86d3f646
factorize av_set_pts_info
...
Originally committed as revision 18808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 04:22:53 +00:00
1fbbedff85
cosmetics, alignment
...
Originally committed as revision 18807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 04:20:23 +00:00
f65aad9587
rgb555le, rgb565le, rgb565be, bgr24 in .mov muxing
...
Originally committed as revision 18790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:41:01 +00:00
5b50b8f57f
bgra in .mov muxing
...
Originally committed as revision 18789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:14:42 +00:00
dfb0471fce
correct pixfmt for argb
...
Originally committed as revision 18788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:12:36 +00:00
ed88074a32
rgba in .mov muxing
...
Originally committed as revision 18787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-10 20:11:11 +00:00
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
b275500706
Split bitstream.h, put the bitstream writer stuff in the new file
...
put_bits.h.
Originally committed as revision 18461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 08:35:26 +00:00
3c8d144789
move codec tag tables near corresponding code
...
Originally committed as revision 18370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:34:05 +00:00
08680ab8c2
cosmetics, reindent
...
Originally committed as revision 18369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:31:53 +00:00
0872acc45c
cosmetics, add empty line and remove useless braces
...
Originally committed as revision 18368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:31:17 +00:00
b6cb99469f
fix compilation, add missing parenthesis
...
Originally committed as revision 18367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:28:39 +00:00
130ba4b17a
comment the ipod subtitle check
...
Originally committed as revision 18366 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:26:47 +00:00
6452af7a33
invert condition to simplify code
...
Originally committed as revision 18365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:25:11 +00:00
cf9ce6a3d6
remove no more needed code, tag is set by default
...
Originally committed as revision 18364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:23:15 +00:00
2ab57c0443
cosmetics, reindent, add empty lines
...
Originally committed as revision 18363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:21:43 +00:00
6b60028595
split mov_find_codec_tag in separate per format functions
...
Originally committed as revision 18362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 22:19:58 +00:00
2fa6bc789f
set bits_per_coded_sample for rawvideo
...
Originally committed as revision 18356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 20:47:56 +00:00
50d2d05d34
override mov fourcc for pcm audio, this is safer when stream copying
...
Originally committed as revision 18355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 20:37:30 +00:00
5c5776e10d
allocate tracks instead of using MAX_STREAMS
...
Originally committed as revision 18140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 03:52:55 +00:00
7c4502c8c4
typo in the mail, the 4am commit is always the worst
...
Originally committed as revision 17981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:53:12 +00:00
4909e517fd
cosmetics
...
Originally committed as revision 17980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:52 +00:00
983bdd3788
add my copyright in mov de/muxer
...
Originally committed as revision 17979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 10:49:28 +00:00
d168b3fd2d
reindent
...
Originally committed as revision 17940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:05:18 +00:00
7943a90a0d
keep original tag when stream copying subs with ipod format
...
Originally committed as revision 17939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:04:44 +00:00
c569bd0632
ipod supports both subs tags
...
Originally committed as revision 17938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:03:42 +00:00
80357cfcfb
reindent
...
Originally committed as revision 17937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:02:59 +00:00
9f52055463
write correct atoms based on tag and not format, fixes subs stream copy
...
Originally committed as revision 17936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 08:01:39 +00:00
d1df4da00b
use correct codec tag list for ipod format
...
Originally committed as revision 17935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 07:59:38 +00:00
a2523ce2e2
fix subs track height, set track->height to codec height if not set
...
Originally committed as revision 17929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-11 06:04:56 +00:00
2d243fb3fc
Rename movenc.c MOVContext to MOVMuxContext, since MOVContext is already used
...
in mov.c for the demuxer. See "[PATCH] rename movenc.c MOVContext to
MOVMuxContext" thread on the mailinglist.
Originally committed as revision 17659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 16:02:29 +00:00
d9fc9ff31b
movenc: add muxing of language along with metadata tags when available
...
Originally committed as revision 17612 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:13:48 +00:00
2904fd398f
return -1 for errors in ff_mov_iso639_to_lang() to allow for error checking
...
Originally committed as revision 17611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:11:18 +00:00
b97fb809b8
cosmetics: indentation
...
Originally committed as revision 17610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:08:22 +00:00
1ee2d44805
use new metadata API in mov muxer
...
Originally committed as revision 17609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 13:06:49 +00:00
2591821213
Add AVFMT_VARIABLE_FPS to specify which muxers do not need duplicated frames.
...
Originally committed as revision 17554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-24 15:04:18 +00:00
6a460c36b6
write active picture height for d-10/imx in mov
...
Originally committed as revision 17178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-12 09:15:36 +00:00
406792e7b0
cosmetics: Remove pointless period after copyright statement non-sentences.
...
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
5d2160a0dd
move actual writing before so new size can be taken into account
...
Originally committed as revision 16623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-16 01:12:32 +00:00
ca93bc175a
Reindent after last commit
...
Originally committed as revision 16617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:07:59 +00:00
0a63a676ec
Do not reallocate AVPacket's data when muxing a packet
...
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-15 14:03:07 +00:00
b250f9c66d
Change semantic of CONFIG_*, HAVE_* and ARCH_*.
...
They are now always defined to either 0 or 1.
Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
87609b51da
cosmetics
...
Originally committed as revision 16535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:42:24 +00:00
985688b8e5
remove warnings about uninitialized vars
...
Originally committed as revision 16534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:41:43 +00:00
3d1b0fcd59
cosmetics
...
Originally committed as revision 16532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:36:19 +00:00
f620488654
Add support for muxing mov/mp4/3gp timed text streams
...
Originally committed as revision 16531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 10:26:44 +00:00
c3e92a6cb4
remove _t in typedef for POSIX compatibility
...
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 20:06:56 +00:00
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
bed4fc54c9
write copyright metadata tag
...
Originally committed as revision 15276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 19:11:53 +00:00
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
1993f8d640
terminate tag tables by CODEC_ID_NONE
...
Originally committed as revision 15259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 00:58:24 +00:00
cf74dd4a5c
do not fail if audio is uncompressed and frame size is not set, just set it
...
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:30:27 +00:00
efa1fb39d2
cosmetics, remove whitespace
...
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:26:31 +00:00
4ed1942008
actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr
...
Originally committed as revision 15197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:25:55 +00:00
544a0f47af
skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits,
...
patch by Damiano Galassi, damiog at gmail dot com
Originally committed as revision 15196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:17:21 +00:00
c4e02d702c
change the logic to mux 13818-3 and 11172-3 in mp4, less code
...
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:42:09 +00:00
e00c3de821
forbid mp3 < 16000hz in anything except mov
...
Originally committed as revision 15189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:31:03 +00:00
c3b1325158
dirac muxing support in mp4/mov
...
Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:23:24 +00:00
baa0be4cf0
cosmetics, vertical align
...
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:08:56 +00:00
d4a240cbc9
ac3 muxing support in mov/mp4/m4v
...
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:05:22 +00:00
dfce888f8a
correctly mux mpeg2 audio 13818-3 in mp4
...
Originally committed as revision 15156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 20:48:45 +00:00
e8c4df40e3
check for malloc failure
...
Originally committed as revision 15132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:21:00 +00:00
db568c079a
copy whole frame in vosData for dnxhd, this code will be used for other codecs too
...
Originally committed as revision 15131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:20:12 +00:00
c18545929e
Change codec_tag type from const struct AVCodecTag ** to const struct AVCodecTag * const *
...
Originally committed as revision 14947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:51:50 +00:00
5972945197
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
...
the corresponding AVStream instead of AVCodecContext
Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:43:20 +00:00
bc4c3a55f5
clarify error message about codec tag
...
Originally committed as revision 14013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:29:11 +00:00
40f8675ccf
set correct ftyp minor version for 3gp/2
...
Originally committed as revision 13774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-15 01:38:38 +00:00
6ba9ed9557
invert mode_mov condition
...
Originally committed as revision 13773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:12:51 +00:00
d3e4783212
simplify
...
Originally committed as revision 13772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-14 21:11:16 +00:00
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
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
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
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
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
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
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
a04aec6d1a
simplify MODE_3G2
...
Originally committed as revision 13755 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 03:08:41 +00:00
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
ce072b2d30
cosmetics, reindent
...
Originally committed as revision 13752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 00:56:54 +00:00
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
927509e10b
indent
...
Originally committed as revision 13747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:40:40 +00:00
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
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
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
d32d6defee
simplify
...
Originally committed as revision 13743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 09:06:27 +00:00
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
David Conrad
Justin Ruggles
Daniel Verkamp
Larbi Joubala
Stefano Sabatini
Ronald S. Bultje
Aurelien Jacobs
Michael Niedermayer
Diego Biurrun
Luca Abeni
Kurtnoise
Damiano Galassi
Reimar Döffinger