8978fedaee
avio: introduce an AVIOContext.seekable field
...
Use it instead of url_is_streamed and AVIOContext.is_streamed.
2011-04-03 22:46:40 +02:00
19457a5d4a
Fix issue2246
...
ignore last ctts duration
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-03 16:40:12 +02:00
7ac167493e
Merge remote-tracking branch 'newdev/master'
...
* newdev/master:
mpegts: propagate avio EOF in read_packet()
configure: Initial support for --target-os=symbian
Fixed-point FFT and MDCT
Include dependencies for test programs
ac3enc: simplify sym_quant()
flvdec: read index stored in the 'keyframes' tag.
mov: Add support for zero-sized stsc runs.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-01 02:58:15 +02:00
9dd94f8379
mov: Add support for zero-sized stsc runs.
...
A zero sized stsc run doesn't make a lot of sense but the spec does not
prohibit them and MPlayer VLC demuxers support them.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-03-31 07:28:20 +02:00
27ef7b1bcd
Merge remote-tracking branch 'newdev/master'
...
* newdev/master:
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
Use audio_service_type to set stream disposition.
Add APIchanges entry for audio_service_type.
Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
configure: in check_ld, place new -l flags before existing ones
support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
doc: update build system documentation
aacenc: indentation
aacenc: fix the side calculation in search_for_ms
vp8.c: rename EDGE_* to VP8_EDGE_*.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-26 03:06:30 +01:00
eb81cf860c
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
2011-03-25 16:59:09 -04:00
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
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
45a8a02a41
lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:24:51 -04:00
db44ea960d
avio: avio_ prefix for url_fsize
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 76aa876e69
2011-03-08 02:09:21 +01:00
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 17:20:31 -05:00
76aa876e69
avio: avio_ prefix for url_fsize
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 11:03:39 -05:00
4118d66cb3
Revert "lavf: deprecate get_strz() in favor of avio_get_str"
...
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.
This reverts commit 773947ba76
2011-03-06 02:16:00 +01: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
773947ba76
lavf: deprecate get_strz() in favor of avio_get_str
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e16ead0716
2011-03-05 02:29:28 +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
e16ead0716
lavf: deprecate get_strz() in favor of avio_get_str
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:02 -05:00
74b3f67c9c
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e356fc57a2
2011-03-03 14:15:08 +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
e356fc57a2
lavf: replace all uses of url_fskip with avio_seek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:22:16 -05: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
ebb92e0768
avio: rename url_fopen/fclose -> avio_open/close.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32
2011-02-23 18:22:03 +01:00
22a3212e32
avio: rename url_fopen/fclose -> avio_open/close.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23 10:18:55 -05:00
e63a362857
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit b7effd4e83
2011-02-22 02:44:37 +01:00
b7effd4e83
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-21 11:23:22 -05:00
ae99313aa5
avio: move init_put_byte() to a new private header and rename it
...
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e731b8d872
2011-02-20 19:05:47 +01: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
e731b8d872
avio: move init_put_byte() to a new private header and rename it
...
init_put_byte should never be used outside of lavf, since
sizeof(AVIOContext) isn't part of public ABI.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:31 -05:00
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
5e81cb580a
mov: remove stray semicolon
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 628b16f45f
2011-02-11 02:54:09 +01:00
628b16f45f
mov: remove stray semicolon
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-10 14:17:24 +00:00
e11afd71a3
pass QDMC extradata to the decoder
...
Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ed19fafd48
2011-02-09 03:30:01 +01:00
ed19fafd48
pass QDMC extradata to the decoder
...
Makes playing QDMC files in MPlayer work when using the libavformat demuxer.
Problem was that the extradata was not passed from demuxer to decoder.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-06 16:05:55 -05:00
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
2011-01-30 03:41:48 +01:00
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
2f7d8977bc
mov: add support for little-endian utf16 chapter names
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 97b04f5ed3
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
ebf3ee16c7
mov: simplify mov_read_chapters() by using avio_get_str16be
...
It probably also fixes a memleak or two.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 225b6d7fde
2011-01-28 03:15:34 +01:00
bc1aebcd07
Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"
...
This reverts commit c34461b35bc4f8765ac5
2011-01-28 03:15:34 +01:00
97b04f5ed3
mov: add support for little-endian utf16 chapter names
...
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
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
225b6d7fde
mov: simplify mov_read_chapters() by using avio_get_str16be
...
It probably also fixes a memleak or two.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 22:03:21 +00:00
c4f8765ac5
Revert "mov: simplify mov_read_chapters() by using avio_get_str16be"
...
This reverts commit c34461b35b
2011-01-26 22:03:21 +00:00
0c468f5684
mov: simplify mov_read_chapters() by using avio_get_str16be
...
It probably also fixes a memleak or two.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit c34461b35b
2011-01-26 03:43:31 +01:00
c34461b35b
mov: simplify mov_read_chapters() by using avio_get_str16be
...
It probably also fixes a memleak or two.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01: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
c3024f9e7e
In mov demuxer, handle better wrong time scale, fix issue #2528
...
Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 21:06:37 +00:00
f6253caf8b
In mov demuxer, set r_frame_rate for cfr files
...
Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-11 19:58:00 +00:00
5e2202d6f3
In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490
...
Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:21:04 +00:00
4af7166fb4
In mov demuxer, check that stts data exists, fix crash, issue #2479
...
Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:14:44 +00:00
c6f1e29a15
In mov demuxer, read alac sample from extradata, fix #2406
...
Originally committed as revision 25901 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 01:38:26 +00:00
adc7305424
In mov demuxer, if multiple h264 stsd are present, do not concatenate streams, fix #2069
...
Originally committed as revision 25825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 05:03:29 +00:00
798c6facb7
In ts demuxer, support aac flexmux using extradata in iods, issue #2346
...
Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 00:51:12 +00:00
7df2214328
movdec: export creation_date as metadata
...
Originally committed as revision 25786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 19:02:52 +00:00
2b91d83ef3
In mov demuxer, export .mov encoder metadata tag
...
Originally committed as revision 25757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-16 05:55:09 +00:00
2f412421e8
movdec: Free the previous extradata
...
If multiple stsd atoms are parsed for the same stream, the old
extradata would be leaked.
Originally committed as revision 25360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-05 21:36:30 +00:00
dc2cabd003
movdec: Split out ff_mov_read_stsd
...
Originally committed as revision 25359 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-05 21:35:44 +00:00
6d19fd5c26
In mov demuxer, check that nb_streams is valid before using it in read_dac3
...
Originally committed as revision 25240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-28 00:33:21 +00:00
0e7d436d92
Check dref size based on a patch by google
...
Originally committed as revision 25081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:20:24 +00:00
9044dd8399
In mov demuxer, do not override aspect ratio in tkhd by pasp like quicktime, fix issue #1539
...
Originally committed as revision 25080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-08 20:18:14 +00:00
bdecdd2bfc
Read the number of channels from the 'dac3' tag for AC-3 in MP4.
...
Originally committed as revision 25054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-06 21:52:11 +00:00
8fc0162ac4
Add av_ prefix to bswap macros
...
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
105b37859b
mov: Read Flash's chpl variant
...
This is based off of F4V specs rather than any actual files
Originally committed as revision 24035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-04 04:59:12 +00:00
380966a801
In mov demuxer, fix seeking to the beginning when file has edit lists.
...
Patch by John Stebbins, stebbins at jetheaddev dot com
Fixes issue #2046
Originally committed as revision 23966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 08:24:37 +00:00
525fcb2798
In mov demuxer, only set sar if not already set, patch by Andrew Wason,
...
rectalogic at rectalogic dot com
Fixes issue #1754
Originally committed as revision 23948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 23:18:27 +00:00
7d6096e42e
Use ext sample from mpeg4audio config if set with AAC SBR
...
Originally committed as revision 23947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-01 22:31:31 +00:00
2209ffacb9
In mov demuxer, increase total size after debugging message
...
Originally committed as revision 23864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-28 21:02:16 +00:00
3491866a4b
Improve mov atom parsing debug message, print parent atom and size in decimal
...
Originally committed as revision 23764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-25 01:19:03 +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
1cf9f6ed4f
mov: Read nero chapters
...
Originally committed as revision 23020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-05 08:41:01 +00:00
2ef6c1242a
Mark av_metadata_set() as deprecated, and use av_metadata_set2()
...
in its place.
av_metadata_set() is going to be dropped at the next major bump.
Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00
7221579b0c
mov: Read QuickTime chapters
...
Originally committed as revision 22928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 06:36:09 +00:00
653d7aeb61
Parse strf mov atoms
...
This fixes roundup issue 1270.
Originally committed as revision 22894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-16 20:36:24 +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
08a186c648
In mov demuxer, convert mac encoded strings to utf-8
...
Originally committed as revision 22365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 01:03:42 +00:00
987e857f63
Preallocate index entries in mov demuxer, huge speedup
...
Originally committed as revision 22363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-09 00:46:26 +00:00
998257bd4f
Make mp4_read_descr static: It is only used inside libavformat/mov.c.
...
Originally committed as revision 22097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 01:51:13 +00:00
bbdf0d2214
Make sure we dont write more bytes into filename than the array is long.
...
just a precaution in case the size of the source array is increased or
made dynamically allocateable.
Originally committed as revision 21926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:57:23 +00:00
6a2459059e
Do not attempt to open references through absolute pathes.
...
This would allow an attacker to test remotely if a local file exists.
Originally committed as revision 21925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:48: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
895a9be60c
Force codec_tag I420 for Quicktime Planar Y'CbCr 8-bit 4:2:0 raw codec,
...
because YV12 triggers an UV swap in rawdec.c, fixes issue 1687.
Originally committed as revision 21436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 21:37:35 +00:00
49c43fc278
reindent
...
Originally committed as revision 21311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:58:10 +00:00
c3aeaa540d
set average frame rate in mov demuxer
...
Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:56:04 +00:00
c956611527
move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4
...
Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 21:38:39 +00:00
ff5ab5c8c9
set stream aspect from mov tkhd width/height, patch by Andrew Wason, rectalogic at rectalogic dot com
...
Fixes issue 671.
Originally committed as revision 21210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-14 00:32:36 +00:00
49544546b0
do not skip mdat data if it's the last atom, avoids one seek
...
Originally committed as revision 21209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 23:33:29 +00:00
7b1312fa55
cosmetics, remove useless parentheses, add space
...
Originally committed as revision 21025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:59:43 +00:00
a510991cff
simplify error handling in mov_read_default
...
Originally committed as revision 21024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:58:19 +00:00
cb41b2b6e0
remove no more needed MOVAtom.offset field
...
Originally committed as revision 21023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:51:38 +00:00
7ead7e2181
remove useless code skipping data at end of hdlr atom, already done in mov_read_default
...
Originally committed as revision 21022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-04 22:48:27 +00:00
6866dd1237
Fix typo.
...
Originally committed as revision 20628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-27 13:10:56 +00:00
b9c78bca26
MOV: cprt is another tag used for copyright
...
Originally committed as revision 20587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-23 08:47:47 +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
e26df9ebf1
use AVFormatContext in dprintf
...
Originally committed as revision 20554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-19 21:03:25 +00:00
adeb907137
Search relative path according to alias record when opening mov reference files.
...
Based on patch by Maksym Veremeyenko, verem at m1stereo dot tv
Originally committed as revision 20539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-15 03:26:47 +00:00
ba278391ba
Debug print MP4 objectTypeIndication in hex not decimal as values are listed in
...
hex in all official documents.
Originally committed as revision 20523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 02:22:19 +00:00
5aea268d14
Add a channels field to MPEG4AudioConfig.
...
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 20:24:23 +00:00
a4cb56aaf4
change \0xa9enc tag metadata name to encoder to match id3v2
...
Originally committed as revision 20469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-06 18:59:25 +00:00
bddc2df52e
10l, typo
...
Originally committed as revision 20462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 08:53:05 +00:00
c2564699bf
do not redundantly set stream nb_frames, it's already set in read_stts
...
Originally committed as revision 20459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:32:50 +00:00
e745272196
compute dts shift with ctts value, cslg atom might be missing, fix #419
...
Originally committed as revision 20458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:30:53 +00:00
fedb1eca07
check that duration is set to avoid fpe
...
Originally committed as revision 20457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:17:10 +00:00
507330b9d3
warn if stream timescale is not set and set it to 1 to avoid FPE
...
Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 07:11:54 +00:00
55d2e32a40
fix \0xa9wrt metadata, to composer, fix issue #1501
...
Originally committed as revision 20453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-05 01:40:13 +00:00
c5898e8623
compute codec bitrate in mov demuxer, patch by haim alon, haim dot alter at gmail dot com
...
Originally committed as revision 20368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-24 20:40:00 +00:00
f2ad907060
10l in code reading codec_name, the first byte is the length and should not
...
become part of the string.
Originally committed as revision 20102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 18:27:39 +00:00
19635234b1
Convert latin1 codec_name in mov to UTF-8, since all strings in FFmpeg
...
must be valid UTF-8.
Originally committed as revision 20092 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-30 09:43:56 +00:00
a42bf19134
100l, typo
...
Originally committed as revision 20033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 21:06:18 +00:00
7b5252ce3e
Export mov/mp4 major and compatible brands as metadata.
...
Patch by haim alon, haim dot alter at gmail dot com
Originally committed as revision 20032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-26 20:51:38 +00:00
2d423666c0
Make mov LPCM and AAC parsing functions public
...
Originally committed as revision 19878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 11:35:01 +00:00
e4bc8af1e6
check entries against field_size, potential malloc overflow in read_stsz, fix #1357
...
Originally committed as revision 19793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:42:51 +00:00
1c4bf2ec37
add one missing check for stream existence in read_elst, fix #1364
...
Originally committed as revision 19792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-07 22:36:33 +00:00
d862fce758
only set par if it does not indicates a rotation, ex iphone 3GS
...
Originally committed as revision 19271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 00:17:47 +00:00
e1c1b0ff09
Reindent after last patch.
...
Originally committed as revision 19265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:40:00 +00:00
3fe4d5d4e6
mov demuxer: Track the current position also for streams that have AVDISCARD_ALL set.
...
This allows for seamless switching of e.g. audio streams, with the previous code
playback started always from the beginning when removing AVDISCARD_ALL.
Originally committed as revision 19264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 09:38:42 +00:00
5dc5c43bda
mov_read_packet: extract code that searches for the stream/sample to demux next
...
into a separate function.
Originally committed as revision 19263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:57:53 +00:00
a2f3851166
mov_read_packet: if dv_get_packet fails, return exactly its error value
...
instead of always -1 (makes no real difference currently since dv_get_packet
always returns -1 so far).
Originally committed as revision 19262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:50:46 +00:00
69fc436cbc
In mov_read_packet remember the AVStream we want to demux next instead of the
...
MOVStreamContext. We need the AVStream anyway and it is easier to get the
MOVStreamContext from the AVStream than the other way around.
Originally committed as revision 19261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 08:23:40 +00:00
6a63ff19b6
check stream existence before assignment, fix #1222
...
Originally committed as revision 19259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-24 03:38:47 +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
53e099de8b
check atom size against edit_count to avoid very long loop
...
Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 02:07:41 +00:00
86b61d4241
Also accept TS as a prefix for wav twoccs (used by Flip4Mac) instead of
...
adding entries to codec_movaudio_tags.
This ensures ADPCM_IMA_WAV uses the standard ms prefix when muxing to mov
rather than TS.
Originally committed as revision 19177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 00:50:57 +00:00
bbe46bc4c2
Remove time_rate, we cannot compute exactly when fragments are
...
used and we cannot determine if fragments are present or not in
streamed mode.
Originally committed as revision 19148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-11 05:13:23 +00:00
281551131d
broken stsd length might be < 16, fix elst-assert.mp4
...
Originally committed as revision 19084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-03 23:13:53 +00:00
7e69621f56
split audio chunks in mov demuxer
...
Originally committed as revision 19018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-31 04:36:26 +00:00
350f2c2cef
return AVERROR_EOF
...
Originally committed as revision 18992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-30 06:15:27 +00:00
2d5fabc87a
move increment after debug print
...
Originally committed as revision 18851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 04:08:34 +00:00
171a353159
parse 'stps' atom to set keyframe, partial sync sample for mpeg-2 open gop
...
Originally committed as revision 18813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 08:31:22 +00:00
41e6499996
remove comment
...
Originally committed as revision 18811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:57:08 +00:00
4b29ed399f
Parse 'cslg' atom to retrieve dts shift when 'ctts' duration is negative.
...
We have now dts <= pts, note that for some B frames dts+1 == pts can happen
if a crappy timebase is used instead of correct /1001.
Originally committed as revision 18810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 07:55:03 +00:00
b24bbbb4da
Introduce codec id for MPEG-4 ALS and associate it with corresponding
...
AudioObjectType. Also bump libavcodec minor version.
Originally committed as revision 18591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-17 19:17:14 +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
17ad7b24c8
force sample for qcelp when not stored in mov, fix #968
...
Originally committed as revision 18374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-08 03:38:59 +00:00
3dd3604197
Reindent
...
Originally committed as revision 18315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 11:27:14 +00:00
fb9ac65411
Support DVD subtitles in mov/mp4 as created by Nero.
...
See also http://samples.mplayerhq.hu/sub/NeroMP4/unsupported-embedded-subs-2.mp4
Originally committed as revision 18314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-02 11:26:46 +00:00
f03a081df0
set wrong_dts for iMovie created files which has huge ctts delay, fix ffmpeg_sample.m4v
...
Originally committed as revision 18181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-25 06:07:13 +00:00
2121b160d5
Remove alpha channel from default colorspace tables, since it is unused. See
...
"qtpalette.h" thread on mailinglist.
Originally committed as revision 18144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 13:05:13 +00:00
08a5b4e9b5
since code now use get_bits_long, allocate padding buffer
...
Originally committed as revision 18138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 02:47:35 +00:00
a0dd3c0039
reset codec width/height for h264 forcing decoder to parse extradata
...
Originally committed as revision 18134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-21 23:29:34 +00:00
5c3d507f1a
MOV: Use the AOT enum for the mp4_audio_types mapping.
...
Originally committed as revision 18044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 18:13:42 +00:00
2ac736a6da
Extend mov edit list support to work for a first padding entry with
...
time == -1 and duration. Complicated since time is relative to stream,
duration relative to container time base.
Originally committed as revision 18019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 20:49:52 +00:00
d0dab0ecd4
Cosmetics: Re-indent after last commit
...
Originally committed as revision 18017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 16:24:38 +00:00
bd27eed6d0
MOV: Support stz2 "Compact Sample Size Box"
...
Originally committed as revision 18016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 16:14:36 +00:00
f05783c2db
cosmetics, remove useless braces
...
Originally committed as revision 18004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:57 +00:00
9bf1b2683c
simplify printing
...
Originally committed as revision 18003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:46:28 +00:00
f584386d54
reindent
...
Originally committed as revision 18002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:44:16 +00:00
c6026e4360
fix trkn metadata parsing
...
Originally committed as revision 18001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:43:38 +00:00
0fb44a4e47
move read_udta_string up to avoid forward declaration
...
Originally committed as revision 18000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:06:05 +00:00
873358e5d4
more generic metadata handling
...
Originally committed as revision 17999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 06:03:29 +00:00
2229a5c60e
do not set isom if ctype is not set, happens in mov
...
Originally committed as revision 17998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-16 05:13:55 +00:00
df8843c65f
search for hdlr atom in meta, some files do not store version+flags
...
Originally committed as revision 17996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 23:54:53 +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
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
e49da8273b
allocate palette in codec directly
...
Originally committed as revision 17976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:44:57 +00:00
6c00a9dec2
cosmetics, add some whitespaces and empty lines
...
Originally committed as revision 17975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 09:06:36 +00:00
f0f2218dce
do not modify sample_count, check against index entries
...
Originally committed as revision 17972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-15 07:21:22 +00:00
88c4339bda
Move MOVContext and related structures from mov.c to isom.h. See "[PATCH]
...
move MOVContext from mov.c to isom.h" thread on ML.
Originally committed as revision 17915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-09 21:53:00 +00:00
63581eb183
MOV: fix demuxing fragmented files
...
Originally committed as revision 17803 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-04 07:57:09 +00:00
fefe43ff2c
MOV: fix crash when 'meta' occurs before first 'trak'
...
Originally committed as revision 17781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-03 18:19:44 +00:00
bc718b4720
fix missed usage of old metadata API in mov demuxer
...
Originally committed as revision 17689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 16:06:26 +00:00
f3592353ce
Add a context to av_log() call.
...
Originally committed as revision 17638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-27 08:31:20 +00:00
bc64cb9680
check av_get_packet return value
...
Originally committed as revision 17514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 01:07:46 +00:00
0d8f0abfb9
return AVERROR(ENOMEM) if alloc failed, set count after alloc, use variable when reallocing, based on patch by Netgem
...
Originally committed as revision 17509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 00:20:07 +00:00
54b4ea57fd
demux some more metadata tags in mov
...
Originally committed as revision 17321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 14:13:28 +00:00
49674dd052
use new metadata API in mov demuxer
...
Originally committed as revision 17309 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-15 02:28:54 +00:00
5b4f5e5dff
fix frame size, time rate is not stts duration anymore with time offset
...
Originally committed as revision 17162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 21:11:19 +00:00
fcdd622cfc
do not set start time to 0, it is not the case with elst time offset
...
Originally committed as revision 17161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 20:19:35 +00:00
a5929abe7a
adjust time rate according to elst time offset
...
Originally committed as revision 17146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-11 02:32:39 +00:00
4c125b8f6e
fix compilation with DEBUG defined, field does not exist anymore
...
Originally committed as revision 17115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-10 02:27:26 +00:00
04e06cfa20
cosmetics: sample_to_chunk -> stsc
...
Originally committed as revision 17054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:59:31 +00:00
a234e38d6e
cosmetics: sample_to_ctime -> ctts
...
Originally committed as revision 17053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:57:28 +00:00
1975c52c2a
remove useless field
...
Originally committed as revision 17052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:55:23 +00:00
425c9962b2
fix doxygen
...
Originally committed as revision 17049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 09:39:19 +00:00
8e2fd8e1d4
Replace the calls to the deprecated av_alloc_format_context() with
...
corresponding calls to avformat_alloc_context().
Originally committed as revision 17048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 08:27:26 +00:00
baf2ffd329
offset dts according to edit list, hackish but works, based on patch by Reimar
...
Originally committed as revision 17037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08 04:27:07 +00:00
bf252f7f6f
prevent reading more than container atom size, fix broken file broken_by_rev15830.MOV, fix #818
...
Originally committed as revision 16979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-03 23:03:41 +00:00
8dc81a4524
seek at 0 when timestamp requested is negative
...
Originally committed as revision 16815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 04:29:33 +00:00
dce25564cc
'code' is used to index a table so make it unsigned
...
this prevents using negative index and possibly crashing with broken files
Originally committed as revision 16714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-21 22:32:17 +00:00
f53ee31275
change sample aspect ratio test to be more clear, print old one
...
Originally committed as revision 16703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-20 21:06:57 +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
9ce6c13879
export gcd function as av_gcd()
...
Originally committed as revision 16653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 11:13:33 +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
6cdbff63cd
Use the dimensions in tkhd for timed text tracks
...
Originally committed as revision 16561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 23:24:28 +00:00
6a5d31ac25
Fix build: Add intreadwrite.h and bswap.h #includes where necessary.
...
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 22:19:48 +00:00
64d50fa551
move ffindex set before mov_read_default so it can be used in functions
...
Originally committed as revision 16548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 21:04:25 +00:00
58e9f2edb6
Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text
...
Originally committed as revision 16530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-11 08:24:44 +00:00
fa50a0276f
only set le if value is 1, fix boom5.mov, issue #770
...
Originally committed as revision 16507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-09 22:13:37 +00:00
364df7b7b9
cosmetics, remove useless parenthesis and whitespaces
...
Originally committed as revision 16213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 09:18:43 +00:00
a15328249d
set alac channels from extradata, fix alac mono in m4a
...
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 09:17:19 +00:00
271344377a
check that nb_streams is valid before setting stream, fix crash with jp2 which do not use same structure
...
Originally committed as revision 16166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 08:47:28 +00:00
6da5407401
parse pasp atom and set sample aspect ratio,
...
warn if transformation matrix differs from pasp,
based on a patch by Skal.
Originally committed as revision 16066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 22:24:56 +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
73b458e354
Commit last ok'ed parts of QCELP decoder and enable it.
...
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-02 16:48:05 +00:00
061f407e53
More OKed parts of the QCELP decoder
...
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-01 22:07:00 +00:00
12e416c848
decrease atom size, fix broken files missing version/flags
...
Originally committed as revision 15872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-18 09:09:57 +00:00
51c1520114
read itunes metadata, code based on Reimar's patch
...
Originally committed as revision 15840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 01:59:35 +00:00
86b0affd08
simplify metadata reading
...
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:17:19 +00:00
5b9ce252a9
10l, fix amrwb sample rate
...
Originally committed as revision 15562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 23:30:35 +00:00
Anton Khirnov
Michael Niedermayer
Alex Converse
Justin Ruggles
Mans Rullgard
Sascha Sommer
Luca Barbato
John Stebbins
Diego Elio Pettenò
Baptiste Coudurier
Aurelien Jacobs
Martin Storsjö
David Conrad
Andrew Wason
Stefano Sabatini
Jean-Daniel Dupas
Carl Eugen Hoyos
Anton Khirnov
Jai Menon
Alex Converse
haim alon
Reimar Döffinger
Peter Ross
Daniel Verkamp
Ronald S. Bultje
Benoit Fouet
Diego Biurrun
Kenan Gillet