generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,006 Commits 24 Branches 241 Tags 173 MiB
53285ced19
Commit Graph

499 Commits

Author SHA1 Message Date
Baptiste Coudurier
93dfda8896 In ipod/mov/mp4 muxer, always write esds descriptor length using 4 bytes, 
ipod shuffle doesn't support anything else.
 2011-03-30 14:09:09 -07:00
Baptiste Coudurier
efdad9fbc7 In mov muxer, fix yuv range in avid atoms used by dnxhd. 2011-03-30 08:48:08 -07:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Michael Niedermayer
0fecf2642b Merge remote-tracking branch 'newdev/master' 
Conflicts:
	Changelog
	doc/APIchanges
	doc/optimization.txt
	libavformat/avio.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-03-17 17:22:52 +01:00
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Anton Khirnov
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
Baptiste Coudurier
06ed4873e6 movenc: use correct tag for dvcpro hd 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-02 00:23:08 +00:00
Baptiste Coudurier
fffdee89cc movenc: fix tkhd height for imx 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-01 23:45:03 +00:00
Anton Khirnov
6b4aa5dac8 avio: avio_ prefix for url_fseek 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-03-01 12:12:33 -05:00
Baptiste Coudurier
65ad2c618f In mov muxer, fix adpcm mono muxing, patch by Alex Converse 2011-02-27 16:29:21 -08:00
Ronald S. Bultje
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
Maksym Veremeyenko
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
Maksym Veremeyenko
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
Maksym Veremeyenko
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
Anton Khirnov
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
Ronald S. Bultje
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
Maksym Veremeyenko
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
Maksym Veremeyenko
77d207cbe6 reindent after tapt patch 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-02-25 22:31:16 +01:00
Maksym Veremeyenko
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
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
Anton Khirnov
ae628ec1fd avio: rename ByteIOContext to AVIOContext. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-20 08:37:15 -05:00
Takashi Mochizuki
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
Takashi Mochizuki
44b1120724 movenc: Force first sample as SYNC 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-02-13 01:16:30 +00:00
Janne Grunau
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
Diego Elio Pettenò
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
Janne Grunau
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
Baptiste Coudurier
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
Diego Elio Pettenò
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Martin Storsjö
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
Martin Storsjö
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Martin Storsjö
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
Martin Storsjö
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
Martin Storsjö
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
David Conrad
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
David Conrad
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
David Conrad
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
Tomas Härdin
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
Jean-Daniel Dupas
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
Stefano Sabatini
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Anton Khirnov
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
Stefano Sabatini
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
Mike Melanson
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
David Conrad
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
David Conrad
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
Justin Ruggles
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
Daniel Verkamp
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
Larbi Joubala
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
Larbi Joubala
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
1fbbedff85 cosmetics, alignment 
Originally committed as revision 18807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-05-13 04:20:23 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Stefano Sabatini
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
Stefano Sabatini
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
Baptiste Coudurier
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
Baptiste Coudurier
08680ab8c2 cosmetics, reindent 
Originally committed as revision 18369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-04-07 22:31:53 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
4909e517fd cosmetics 
Originally committed as revision 17980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-15 10:49:52 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
d168b3fd2d reindent 
Originally committed as revision 17940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:05:18 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
80357cfcfb reindent 
Originally committed as revision 17937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-03-11 08:02:59 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Ronald S. Bultje
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
Aurelien Jacobs
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
Aurelien Jacobs
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
Aurelien Jacobs
b97fb809b8 cosmetics: indentation 
Originally committed as revision 17610 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-02-26 13:08:22 +00:00
Aurelien Jacobs
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
Michael Niedermayer
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
Baptiste Coudurier
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
Diego Biurrun
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
Baptiste Coudurier
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
Luca Abeni
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
Luca Abeni
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
Aurelien Jacobs
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
Baptiste Coudurier
87609b51da cosmetics 
Originally committed as revision 16535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:42:24 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
3d1b0fcd59 cosmetics 
Originally committed as revision 16532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:36:19 +00:00
David Conrad
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
Baptiste Coudurier
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
Diego Biurrun
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
Baptiste Coudurier
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
Luca Abeni
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
efa1fb39d2 cosmetics, remove whitespace 
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-04 18:26:31 +00:00
Kurtnoise
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
Damiano Galassi
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
baa0be4cf0 cosmetics, vertical align 
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-09-03 19:08:56 +00:00
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Reimar Döffinger
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
Aurelien Jacobs
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
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
Baptiste Coudurier
d3e4783212 simplify 
Originally committed as revision 13772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-06-14 21:11:16 +00:00
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