b7f2fdde74
avio: rename put_flush_packet -> avio_flush
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:59:39 -04:00
384c9c2fa7
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a2704c9712
2011-03-05 02:29:31 +01:00
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:57 -05:00
cd37308b77
movenc: use correct tag for dvcpro hd
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 06ed4873e6
2011-03-03 14:15:09 +01:00
5bb50c71a3
movenc: fix tkhd height for imx
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fffdee89cc
2011-03-03 14:15:09 +01:00
f59d8ff8cd
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6b4aa5dac8
2011-03-03 14:15:03 +01:00
06ed4873e6
movenc: use correct tag for dvcpro hd
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-02 00:23:08 +00:00
fffdee89cc
movenc: fix tkhd height for imx
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-01 23:45:03 +00:00
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:12:33 -05:00
65ad2c618f
In mov muxer, fix adpcm mono muxing, patch by Alex Converse
2011-02-27 16:29:21 -08:00
4e815a8b60
movenc: remove uses of deprecated API.
...
Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
(cherry picked from commit 13ff92d197
2011-02-26 03:16:09 +01:00
aaa71a3e1d
store pasp atom for all types of quicktime movie
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit d184c86cd3
2011-02-26 03:16:09 +01:00
eea040212c
reindent after tapt patch
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit 77d207cbe6
2011-02-26 03:16:09 +01:00
3b2c4ce140
use tapt atom for sample aspect ratio
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
(cherry picked from commit ea1afa124c
2011-02-26 03:16:09 +01:00
324429309e
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 0abdb29317
2011-02-26 03:16:04 +01:00
13ff92d197
movenc: remove uses of deprecated API.
...
Replace put_tag() with ffio_wfourcc() and ByteIOContext with AVIOContext.
2011-02-25 17:41:00 -05:00
d184c86cd3
store pasp atom for all types of quicktime movie
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-02-25 22:31:16 +01:00
77d207cbe6
reindent after tapt patch
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-02-25 22:31:16 +01:00
ea1afa124c
use tapt atom for sample aspect ratio
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2011-02-25 22:31:16 +01:00
0abdb29317
lavf: use a new ffio_wfourcc macro instead of put_tag() where possible
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-25 14:38:22 -05:00
e9eb8d0bce
avio: avio: avio_ prefixes for put_* functions
...
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 77eb5504d3
2011-02-22 02:44:38 +01:00
77eb5504d3
avio: avio: avio_ prefixes for put_* functions
...
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 14:25:15 -05:00
471fe57e1a
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ae628ec1fd
2011-02-20 19:05:47 +01:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
62bacc4e0c
movenc: Force first sample as SYNC
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 44b1120724
2011-02-14 23:58:17 +01:00
44b1120724
movenc: Force first sample as SYNC
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 01:16:30 +00:00
9653e754a4
movenc: byteswap codec_tag in mov_write_ms_tag
...
based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
(cherry picked from commit 795ed278e6
2011-01-28 03:15:35 +01:00
66355be3c3
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
(cherry picked from commit c6610a216e
2011-01-28 03:15:34 +01:00
795ed278e6
movenc: byteswap codec_tag in mov_write_ms_tag
...
based on Alex Converse's "Fix ADPCM MS in mov muxing" patch
2011-01-28 01:06:57 +01:00
f258964217
In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it
...
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-28 01:06:57 +01:00
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
2011-01-26 22:10:09 +00:00
d4e0130e46
In mov muxer, mux adpcm_ms and adpcm_ima_wav the way quicktime supports it.
...
In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.
2011-01-24 14:20:48 -08:00
a2b7ed3274
In mov muxer, override codec tag for dv in mov, fix remuxing from avi
...
Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 19:56:31 +00:00
10d8eac98d
In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp
...
Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-07 19:55:08 +00:00
91360ce61d
Unset variable fps for mov and mp4 muxer, they support it
...
but timestamps must start at 0 currently, and this causes sync
problem.
Originally committed as revision 25805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 00:41:28 +00:00
96d1e75a0c
In mov muxer, write artist metadata tag
...
Originally committed as revision 25498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 23:23:47 +00:00
edd33cb6fa
In mov muxer, use correct metadata tag for encoder, and use the generic metadata api name
...
Originally committed as revision 25497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 23:16:11 +00:00
6bd296f1e4
In mov muxer, write reduced sample aspect ratio values in pasp
...
Originally committed as revision 25082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:22:02 +00:00
7ad1dc5447
Properly handle IPv6 addresses in the SDP generation
...
Originally committed as revision 24915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 12:29:32 +00:00
8b6e0aec9f
movenc: Free the buffer returned by url_close_dyn_buffer, regardless of the size
...
This fixes a leak introduced in rev 23942, since we write padding to the
buffer unconditionally.
Originally committed as revision 24342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 05:23:28 +00:00
b015be2142
In mov muxer, write pixel aspect ratio tag in mov files.
...
Based on a patch by Daniel Kristjansson, danielk at cuymedia dot net
Originally committed as revision 24124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-08 21:57:20 +00:00
9a191b3a21
Support gray16be and rgb48be in mov
...
Originally committed as revision 23608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-15 09:14:00 +00:00
a7cc89e2f6
fix raw 555 pixel format, add abgr fourcc
...
Originally committed as revision 23479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-04 23:30:58 +00:00
a4de2b6ecf
write 3gp perf tag for artist metadata
...
Originally committed as revision 23268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:06:11 +00:00
221ed48602
albm 3gp tag has optional track field not date
...
Originally committed as revision 23267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:04:39 +00:00
ea4c4d7fe3
change author metadata to artist in mov de/muxer
...
Originally committed as revision 23266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-23 21:03:14 +00:00
e977af6f2e
Add initial support for RTP hinting in the mov muxer
...
Originally committed as revision 23164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:47:24 +00:00
27a826c941
Make mov_write_packet non-static, add ff_ prefix
...
Originally committed as revision 23163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:40:17 +00:00
f72dad4142
Move the mov muxer structures to a separate header
...
Originally committed as revision 23162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 19:38:37 +00:00
ddb630177a
movenc: Write QuickTime chapters
...
Originally committed as revision 23022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 08:41:10 +00:00
1b206f62ea
movenc: Swap positions of mov_write_header and mov_write_packet
...
Originally committed as revision 23021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 08:41:06 +00:00
dc75e4e3b3
movenc: Write nero chapters
...
Originally committed as revision 22927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 06:36:05 +00:00
6b174197b5
Predicting the size of the hdlr, string data and trkn tags in the MOV muxer
...
Originally committed as revision 22846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-12 07:24:30 +00:00
cc947f04cc
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
...
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-31 12:29:58 +00:00
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
fe3ab8adfa
Fix encoder metadata string langcode in mov muxer
...
Originally committed as revision 22369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:53:16 +00:00
cc255afeb5
Correctly mark mov metadata as utf-8, using iso language code
...
Originally committed as revision 22368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:21:09 +00:00
ca76a11948
Add a list of generic tags and change demuxers to follow it.
...
Patch by Anton Khirnov, wyskas at gmail dot com
Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:39:10 +00:00
ade5b91dda
Use av_match_ext() rather than the deprecated match_ext(), fix
...
warnings.
Originally committed as revision 21263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 15:57:51 +00:00
2cf9c7ef9c
Add support for these widely-used iTunes metadata fields: Album Artist,
...
Grouping, and Lyrics.
Originally committed as revision 21010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 02:52:40 +00:00
1bd26e51f3
100l, max value for timescale is UINT16_MAX
...
Originally committed as revision 20661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 18:26:51 +00:00
729ef3ba62
remove useless mov timescale field
...
Originally committed as revision 20652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 02:46:49 +00:00
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
Anton Khirnov
Baptiste Coudurier
Ronald S. Bultje
Maksym Veremeyenko
Takashi Mochizuki
Janne Grunau
Diego Elio Pettenò
Martin Storsjö
David Conrad
Tomas Härdin
Jean-Daniel Dupas
Stefano Sabatini
Anton Khirnov
Mike Melanson
Justin Ruggles
Daniel Verkamp
Larbi Joubala