Commit Graph

4719 Commits

Author SHA1 Message Date
Laurent Aimar
d1c2156bc6 Fix an invalid free in the AVI muxer when an unsupported audio track is added.
patch by Laurent Aimar, fenrir via.ecp fr

Originally committed as revision 15159 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:53:42 +00:00
Diego Biurrun
8212568a1c Replace generic CONFIG_MUXERS preprocessor conditionals by more specific
CONFIG_FOO_MUXER conditionals where appropriate.

Originally committed as revision 15158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:45:13 +00:00
Diego Biurrun
c184318852 Remove pointless #ifdef CONFIG_VHOOK from the code.
The file is only ever compiled if CONFIG_VHOOK is set.

Originally committed as revision 15157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 22:31:41 +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
428626d5d1 allow mp2 to be muxed into mp4
Originally committed as revision 15155 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 19:13:25 +00:00
Michael Niedermayer
74aa41bae4 Fix detection of MPEG4 in MPEG-PS.
Fixes issue568.

Originally committed as revision 15152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-02 15:33:57 +00:00
Justin Ruggles
bdf6972c4b change back to using CONFIG_*_DEMUXER for ac3_eac3_probe(), but use it
correctly this time.

Originally committed as revision 15147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 17:20:49 +00:00
Aurelien Jacobs
23cdcb22a3 matroska: add E-AC-3 support
Thanks again Justin !

Originally committed as revision 15146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:50:12 +00:00
Aurelien Jacobs
75198e7a6d simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
Originally committed as revision 15145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:31:14 +00:00
Justin Ruggles
4d951ef86d check ENABLE_*_DEMUXER instead of CONFIG_*_DEMUXER
Originally committed as revision 15144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:28:15 +00:00
Justin Ruggles
2988c93d94 create a separate codec_id for E-AC-3
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 14:33:54 +00:00
Ronald S. Bultje
5f86057ffd Remove useless "else" case in if X { A; return }; else { B }. See discussion
in "Realmedia patch" thread on mailinglist.

Originally committed as revision 15142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 13:51:24 +00:00
Ronald S. Bultje
d6bb9ebdc6 Some RTSP streams use SDP lines longer than 1024 bytes, so the SDP line
buffer needs to be increased. See discussion in "Realmedia patch" thread
on mailinglist.

Originally committed as revision 15141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 13:47:53 +00:00
Ronald S. Bultje
897ade1ba9 Implement Realmedia-compatible DESCRIBE command.
Originally committed as revision 15140 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 13:46:50 +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
Ronald S. Bultje
1cf151e9ae Send RTSP OPTIONS command to detect server type.
Originally committed as revision 15125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:32:58 +00:00
Ronald S. Bultje
30aa6aed4a Read RealChallenge1 field from the server.
Originally committed as revision 15124 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:32:02 +00:00
Ronald S. Bultje
e077604335 Implement RTSPServerType enum as a way to identify the flavour of RTSP that
the server will send to us (standard-compliant RTP or Realmedia-style RDT).

Originally committed as revision 15123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:30:15 +00:00
Ronald S. Bultje
75128a2273 Revert back to old version (r15103).
Originally committed as revision 15122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 17:23:01 +00:00
Stefano Sabatini
987903826b Globally rename the header inclusion guard names.
Consistently apply this rule: the guard name is obtained from the
filename by stripping the leading "lib", converting '/' and '.'  to
'_' and uppercasing the resulting name. Guard names in the root
directory have to be prefixed by "FFMPEG_".

Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 07:39:47 +00:00
Baptiste Coudurier
b18783644c do no write multi descriptor when only one track is present
Originally committed as revision 15115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:35:09 +00:00
Baptiste Coudurier
6ae9d3faae factorize
Originally committed as revision 15114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:26:12 +00:00
Baptiste Coudurier
f05773ea8f remove mxf_build_structural_metadata, simplify
Originally committed as revision 15113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:25:39 +00:00
Baptiste Coudurier
98f7c5e067 move mxf_write_package to permit function merge
Originally committed as revision 15112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:24:00 +00:00
Baptiste Coudurier
a4d7a6781a cosmetics, Pair -> Entry
Originally committed as revision 15111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:20:47 +00:00
Baptiste Coudurier
d4ffc57d39 store index in table in MXFStreamContext, simplify
Originally committed as revision 15110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:13:44 +00:00
Baptiste Coudurier
f2ebd15952 merge descriptor write table with essence container uls table and simplify
Originally committed as revision 15109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 04:07:41 +00:00
Baptiste Coudurier
b6fa8a8af8 fix type in prototype
Originally committed as revision 15108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:45:00 +00:00
Baptiste Coudurier
85b5ee2b40 remove header_byte_count_offset from context
Originally committed as revision 15107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:42:05 +00:00
Baptiste Coudurier
cc98406051 simplify and correctly rewrite metadata in header partition, mark it closed complete
Originally committed as revision 15106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:36:25 +00:00
Baptiste Coudurier
ca276e6ae2 simplify current partition offset
Originally committed as revision 15105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:20:41 +00:00
Ronald S. Bultje
158efd74fe Implement RTSP/Realmedia-compatible OPTIONS command. See "Realmedia patch"
thread on mailinglist for discussion. This patch also implements a
RTSPServerType enum, which allows the RTSP to keep track of what kind of a
stream we're handling: standard-compliant RTP or a proprietary derivative.
This will be used in subsequent patches to implement more Realmedia-specific
extensions required to receive and parse data coming from a Realmedia server.

Originally committed as revision 15104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:12:13 +00:00
Baptiste Coudurier
6685f639af header partition is open incomplete for now
Originally committed as revision 15102 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:06:38 +00:00
Baptiste Coudurier
7d5fdf900b always write footer partition according to specs
Originally committed as revision 15100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:01:07 +00:00
Baptiste Coudurier
c5a2091295 10l fix mxf_get_essence_container_ul
Originally committed as revision 15098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:55:13 +00:00
Baptiste Coudurier
4e2f346bd1 cosmetics, mux_write -> mxf_write
Originally committed as revision 15097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:50:25 +00:00
Baptiste Coudurier
68f4259c12 correctly set track duration
Originally committed as revision 15096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:49:40 +00:00
Baptiste Coudurier
cdedd878c5 set duration to distinguished value
Originally committed as revision 15095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:46:50 +00:00
Baptiste Coudurier
4d41888300 correctly write codec ul, mpeg-2 needs profile and level to be set
Originally committed as revision 15094 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:41:31 +00:00
Baptiste Coudurier
064abb8aea simplify, pass AVStream directly instead of index
Originally committed as revision 15086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:48:02 +00:00
Baptiste Coudurier
38573e8fb9 cosmetics, whitespace
Originally committed as revision 15085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:44:45 +00:00
Baptiste Coudurier
c872bdb0f8 remove now useless track_number_sign
Originally committed as revision 15084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:41:10 +00:00
Baptiste Coudurier
4ee873e39d put back mxf_essence_container_uls in demuxer as static const
Originally committed as revision 15083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:39:42 +00:00
Baptiste Coudurier
ecb71f8fe8 remove now useless mxf_essence_element_key array
Originally committed as revision 15082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:37:14 +00:00
Baptiste Coudurier
316b438f33 fix track number ul in primer pack
Originally committed as revision 15081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:34:26 +00:00
Baptiste Coudurier
b8ad3f7852 introduce MXFContainerEssencePair to associate essence element key and
essence container easily and compute essence element key in write_header

Originally committed as revision 15080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 01:33:28 +00:00
Baptiste Coudurier
e51a81e0ff cosmetics
Originally committed as revision 15079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:40:11 +00:00
Baptiste Coudurier
e14d374e10 replace sizeof(type) by sizeof *ptr
Originally committed as revision 15078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:39:34 +00:00
Baptiste Coudurier
ac0ab12fe9 merge declaration and init
Originally committed as revision 15077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:36:30 +00:00
Baptiste Coudurier
e7daab1e9c reindent
Originally committed as revision 15076 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:28:51 +00:00
Baptiste Coudurier
3eaa53b35e simplify mxf_write_essence_container_refs
Originally committed as revision 15075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:28:36 +00:00
Baptiste Coudurier
021fa42cb1 factorize
Originally committed as revision 15074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:26:54 +00:00
Baptiste Coudurier
2cd71ce52f change [0] to *
Originally committed as revision 15073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:25:19 +00:00
Baptiste Coudurier
c18d208ae2 compute essence containers in mxf_write_header, this simplifies the code
Originally committed as revision 15072 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 00:23:38 +00:00
Baptiste Coudurier
a2f55f22b3 get essence container ul in header and set it per track, check for unsupported codec
Originally committed as revision 15071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:54:24 +00:00
Baptiste Coudurier
179308768a move per track code in mxf_write_header to be able to check for unsupported configuration
Originally committed as revision 15070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:47:58 +00:00
Baptiste Coudurier
851a8297e8 rename variable
Originally committed as revision 15069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:43:14 +00:00
Baptiste Coudurier
86e456f63e fix typos
Originally committed as revision 15066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:05:42 +00:00
Baptiste Coudurier
60366dd04b cosmetics: header -> generic
Originally committed as revision 15065 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:02:59 +00:00
Baptiste Coudurier
a8f6e362d6 cosmetics, remove useless braces, move comments where appropriate, remove whitespaces
Originally committed as revision 15064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:58:49 +00:00
Baptiste Coudurier
0b62964f54 cosmetics
Originally committed as revision 15063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:45:49 +00:00
Baptiste Coudurier
6fdb4fb0f5 simplify, and factorize
Originally committed as revision 15062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:45:32 +00:00
Baptiste Coudurier
0c0c4d6450 only put version in tag
Originally committed as revision 15061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:41:01 +00:00
Baptiste Coudurier
b43952539b simplify
Originally committed as revision 15060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:38:59 +00:00
Baptiste Coudurier
283a02c51a always write required version string local tag
Originally committed as revision 15059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:37:19 +00:00
Baptiste Coudurier
9fedbc8910 introduce mxf_write_local_tag_utf16 and factorize
Originally committed as revision 15058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:32:23 +00:00
Baptiste Coudurier
6b05863aa9 use strlen and do not write useless trailing 0 according to specs
Originally committed as revision 15057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:24:19 +00:00
Baptiste Coudurier
5f94b92077 write strings as utf16be
Originally committed as revision 15056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 22:23:11 +00:00
Diego Biurrun
9d2526d1b9 Add missing FFMPEG_ prefix to multiple inclusion guard.
Originally committed as revision 15047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 07:17:36 +00:00
Baptiste Coudurier
b83a00b8b6 timestamps in flv are 32bits _signed_ according to flash player, specs are wrong
Originally committed as revision 15045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:07:31 +00:00
Baptiste Coudurier
6f4eb12d31 remove now useless casts
Originally committed as revision 15044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 03:01:59 +00:00
Baptiste Coudurier
ca9c5a4d37 make has_codec_parameters not returning true when sample_fmt is not set
Originally committed as revision 15043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:13:22 +00:00
Baptiste Coudurier
ae58b54b3f skip empty flv data packets, fix issue #602
Originally committed as revision 15042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:10:34 +00:00
Baptiste Coudurier
3d9aecb0d7 factorize packet skip code
Originally committed as revision 15041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:07:01 +00:00
Baptiste Coudurier
6298eb810d simplify size handling code
Originally committed as revision 15040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 22:03:18 +00:00
Baptiste Coudurier
3a25c707fa remove vorbis dec hack, decoding will be done anyway to get frame size
Originally committed as revision 15035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 20:04:28 +00:00
Baptiste Coudurier
77b0443544 speex in flv demuxing
Originally committed as revision 15028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:06:35 +00:00
Baptiste Coudurier
5b9bb66df2 cosmetics, typos, case
Originally committed as revision 15027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 17:04:18 +00:00
Baptiste Coudurier
118d4e1069 cosmetics
Originally committed as revision 15026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 16:56:57 +00:00
Baptiste Coudurier
faac3f0f9f fix version string ul
Originally committed as revision 15025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 16:56:36 +00:00
Michael Niedermayer
f0aaa16fdf Do not truncate timestamps before the muxer as it makes simple
things like last_pts - pts rather tricky and is not good for anything.
Timestamps should be truncated just before storing when needed.

Originally committed as revision 15015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 01:43:27 +00:00
Roman Shaposhnik
f8007a1473 Intial implementation of the DV100 (AKA DVCPRO HD) decoder and demuxer as
specified in SMPTE 370M

Originally committed as revision 15010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 22:41:00 +00:00
Ronald S. Bultje
452d3edb37 Change implementation for ff_data_to_hex(), this is faster. See discussion on
mailinglist in "Realmedia patch" thread.

Originally committed as revision 15006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 12:00:58 +00:00
Ronald S. Bultje
f1c80e3578 Export data_to_hex() as private API in lavf, rename to ff_data_to_hex() and
move it from sdp.c into utils.c. Also add new header internal.h specifically
for lavf-specific internal API. See discussion in "Realmedia patch" thread
on mailinglist.

Originally committed as revision 15002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:43:28 +00:00
Roman Shaposhnik
34fab90f18 Two cosmetic changes for improved readability and ease of HDVCPRO HD integration
Originally committed as revision 14999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 20:28:11 +00:00
Aurelien Jacobs
0dbddda397 matroskadec: cosmetics: indentation
Originally committed as revision 14995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 19:58:55 +00:00
Aurelien Jacobs
6bef5f9b96 matroskadec: seek to the last position known in the index before resorting to
full cluster parsing when seeking after the end of index

Originally committed as revision 14994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 19:57:42 +00:00
Ronald S. Bultje
8646b9070b Use RTPDynamicProtocol parse_sdp_a_line() handlers in case of unknown SDP
lines. This allows "private" SDP tags to be forwarded to the specific handler,
allowing protocol-specific handling of SDP data. See mailinglist discussion
in the "Realmedia patch" thread.

Originally committed as revision 14987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 00:33:22 +00:00
Aurelien Jacobs
d63f529df7 remove useless assignment (st is never read after this line)
Originally committed as revision 14985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 20:38:04 +00:00
Aurelien Jacobs
8e44312d3f matroskadec: index timestamps are supposed to be in the timebase of the stream
Originally committed as revision 14984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 20:32:27 +00:00
Aurelien Jacobs
2a242f4514 mxfdec: set sample_aspect_ratio
Originally committed as revision 14983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 20:21:39 +00:00
Carl Eugen Hoyos
cedebde15a Remaining parts of GSoC MXF muxer by Zhentan Feng.
Originally committed as revision 14975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 15:58:25 +00:00
Michael Niedermayer
274335e76c vertical align
Originally committed as revision 14972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 01:29:43 +00:00
Vitor Sessak
9b0d3e0e03 Import more MXF muxer code from the SoC tree
Originally committed as revision 14968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 20:28:12 +00:00
Andreas Öman
f1588ed525 When setting codec_id during codec probe we must also set codec_type.
Originally committed as revision 14966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 15:39:43 +00:00
Luca Abeni
a9e02947f6 Fix udp.c compilation with recent glibc (>= 2.8)
Originally committed as revision 14963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 06:20:00 +00:00
Aurelien Jacobs
244ee48a82 matroskadec: unset matroska->done when seeking
just in case someone try to seek back after reaching the end of file

Originally committed as revision 14960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 00:17:31 +00:00
Aurelien Jacobs
0f646a2233 matroskadec: full seeking support in index-less files
when trying to seek past the last index entry, just parse more clusters to add them to the index, until an index entry match the desired position

Originally committed as revision 14959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 00:15:49 +00:00
Aurelien Jacobs
8bc98ba92b matroskadec: on the fly index construction for index-less files
each cluster that is read and that contains a video key frame is added
to the index

Originally committed as revision 14957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 00:09:08 +00:00
Aurelien Jacobs
dfbbbdc0bf matroskadec: don't try to seek to negative timestamp
matroska timestamps are unsigned

Originally committed as revision 14956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 23:57:29 +00:00
Aurelien Jacobs
653fb2f80c matroskadec: move setting of matroska->done inside matroska_parse_cluster()
Originally committed as revision 14955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 23:54:14 +00:00
Reimar Döffinger
547ea47d4f Add ff_ prefix to ogg_codec_t structs
Originally committed as revision 14951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:37:43 +00:00
Reimar Döffinger
aecf157ed0 Mark several libavformat arrays const
Originally committed as revision 14950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:24:34 +00:00
Reimar Döffinger
7b571fd7a4 Mark "matroska" probe data string constant.
Originally committed as revision 14949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:19:46 +00:00
Reimar Döffinger
cd34bc7617 Make ogg_codec_t descriptions const
Originally committed as revision 14948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 17:09:15 +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
Ronald S. Bultje
f23a9759ce Remove check for @ in tcp.c which removes the authorization data from the
actual hostname. This functionality already exists (and always existed) in
url_split() and is therefore useless. See discussion in "[PATCH] tcp.c/udp.c
memleak?" thread on ffmpeg-devel.

Originally committed as revision 14946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 16:22:40 +00:00
Aurelien Jacobs
090a41790e voc: add ff_ prefix to some global const data
Originally committed as revision 14945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 14:12:03 +00:00
Reimar Döffinger
e7fd7b9aec Remove useless empty close functions in mmf and mm demuxers.
Originally committed as revision 14944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 14:02:55 +00:00
Aurelien Jacobs
ba18b99ffa matroskadec: make aac_profiles array const
Originally committed as revision 14943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 13:12:41 +00:00
Reimar Döffinger
1bef65f4fe Make the id3v1_genre_str array const, not just the strings it points to.
Originally committed as revision 14942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 12:45:15 +00:00
Vitor Sessak
6986662b5f Import more ok'ed chunks of the mxf muxer from the soc tree
Originally committed as revision 14938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-24 05:55:46 +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
Aurelien Jacobs
c30a4489b4 export sample_aspect_ratio read by the demuxer in a separate field
that the one read by the decoder.

Originally committed as revision 14932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 23:13:58 +00:00
Peter Ross
ee7948cb8d Add raw muxers/demuxers for F64/F32/S32/S24/U32/U24 PCM audio.
Originally committed as revision 14930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 22:36:35 +00:00
Ronald S. Bultje
a3303add3c Cosmetics after previous patches.
Originally committed as revision 14926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:52:26 +00:00
Ronald S. Bultje
8b9af28da4 On failure, return directly because the fail: case does nothing. This also
allows easier control of the actual return value.

Originally committed as revision 14925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:49:16 +00:00
Ronald S. Bultje
47f944a2ef Move malloc() down until after all initializations, so that the resource is
only allocated if initialization worked. This means that on failure, we
don't have to deallocate it.

Originally committed as revision 14924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 18:46:30 +00:00
Ronald S. Bultje
e6c1381982 Fix memleak on some OSes in case network initialization fails. See
"[PATCH] tcp.c/udp.c memleak?" for discussion.

Originally committed as revision 14923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 17:39:56 +00:00
Ronald S. Bultje
ad33bfefc7 Remove useless comments. See "[PATCH] tcp.c/udp.c memleak?" for discussion.
Originally committed as revision 14922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 17:39:10 +00:00
Baptiste Coudurier
7e4b3fb878 enable fl32/64 le/be in mov with stsd audio v2
Originally committed as revision 14919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 15:25:38 +00:00
Luca Abeni
26efefc52c Do not set timestamp information for a non existing AVStream
(fix a bug in the RTP demuxer)

Originally committed as revision 14909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 19:03:05 +00:00
Vitor Sessak
9b9466b0cd Apply parts of MXF muxer ok'ed by Michael
Originally committed as revision 14903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-22 04:12:52 +00:00
Aurelien Jacobs
28f27e0c0c matroskadec: fail cleanly when the required compression lib is not compiled in
Originally committed as revision 14870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 23:08:07 +00:00
Aurelien Jacobs
dc3e0211ed matroskadec: stop parsing when skipping en element crossing over the end of file
Originally committed as revision 14869 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 22:30:15 +00:00
Aurelien Jacobs
eb9cf50a74 matroska: add support for most variants of PCM
Originally committed as revision 14862 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:49:45 +00:00
Aurelien Jacobs
b49d17b77a matroskadec: handle EBML_ID_VOID and EBML_ID_CRC32 in a generic way
Originally committed as revision 14861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:44:25 +00:00
Ronald S. Bultje
ba99cfc213 Implement url_open_protocol(), which is basiclly the former url_open()
but which opens a URLProtocol instead of a filename. url_open() is
reimplemented to call url_open_protocol(). See discussion on
"url_open_protocol" on ffmpeg-devel.

Originally committed as revision 14857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 23:44:23 +00:00
Zhentan Feng
fda0d4afa7 Ok-ed parts from patch by zhentan feng.
Originally committed as revision 14854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 22:01:57 +00:00
Zhentan Feng
1b0732ea64 Remove useless #ifdef DEBUG (patch by Zhentan Feng).
Originally committed as revision 14853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 21:58:47 +00:00
Stefano Sabatini
745b39d5f9 Replace invocations of av_fifo_realloc(), which is going to be
deprecated, with corresponding invocations of av_fifo_realloc2().

Originally committed as revision 14848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 18:49:57 +00:00
Zhentan Feng
2c8d438893 Ok-ed parts from patch by zhentan feng.
Originally committed as revision 14839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 12:36:17 +00:00
Peter Ross
b1c00341a5 Make AIFF demuxer handle F32BE and F64BE PCM audio.
Originally committed as revision 14837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 11:05:29 +00:00
Peter Ross
a1ef2c4bb3 Make MOV demuxer handle F32BE, F32LE, F64BE and F64LE PCM audio.
Originally committed as revision 14836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 11:00:40 +00:00
Peter Ross
57406d8eb8 Make RIFF-based demuxers handle F32LE and F64LE PCM audio.
Originally committed as revision 14835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:54:30 +00:00
Peter Ross
7b21690a91 Make AU demuxer handle S24BE, S32BE and F64BE PCM audio.
Originally committed as revision 14834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:49:38 +00:00
Zhentan Feng
e48891bd9b Ok-ed parts from patch by zhentan feng.
Originally committed as revision 14827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 18:11:00 +00:00
Zhentan Feng
c69968b4fe Factorize common code out of the mxf demuxer.
Patch by zhentan feng.

Originally committed as revision 14826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 17:54:18 +00:00
Peter Ross
fc7ed9a6f6 Support Electronic Arts files containing MP3 audio.
Originally committed as revision 14824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 12:39:57 +00:00
Dave Yeo
e748e34dd6 struct timeval requires #include <sys/time.h>
patch by Dave Yeo  daveryeo _at_ telus _dot_ net

Originally committed as revision 14793 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 18:39:30 +00:00
Michael Niedermayer
3cffbe090a Fix rc_eq mem leak.
Originally committed as revision 14788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 14:46:31 +00:00
Diego Biurrun
4c00864f31 Surround format-specific functions with matching preprocessor conditionals.
Originally committed as revision 14783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 19:24:55 +00:00
Diego Biurrun
7402ee234a Surround AVInputFormat declarations with format-specific #ifdefs.
Originally committed as revision 14782 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 17:28:20 +00:00
Diego Biurrun
964454263c Replace generic CONFIG_MUXERS preprocessor condition around format-specific
functions by more appropriate format-specific preprocessor conditions.

Originally committed as revision 14781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:54:27 +00:00
Diego Biurrun
bcb5430abe Replace generic CONFIG_MUXERS preprocessor conditions around AVOutputFormat
declarations by more specific CONFIG_FOOBAR_MUXER conditions.

Originally committed as revision 14780 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:48:05 +00:00
Diego Biurrun
082f7acfc4 cosmetics: Remove redundant #endif comments that are very close to the #ifdef
condition.  This will make upcoming diffs smaller.

Originally committed as revision 14779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:37:59 +00:00
Diego Biurrun
fb9f111710 cosmetics: misc spelling fixes
Originally committed as revision 14778 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:33:12 +00:00
Michael Niedermayer
ff9c8d7c6f Add flag to mark demuxers that can output discontinuous timestamps.
(could also be added to muxers if someone wants)

Originally committed as revision 14777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 16:13:05 +00:00
Aurelien Jacobs
a964e813a1 use h_addr_list[0] instead of h_addr as this is the posix hostent field name
Originally committed as revision 14768 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:36:05 +00:00
Aurelien Jacobs
7246177d80 ensure we get explicit definition of various _XOPEN_SOURCE functions we use
Originally committed as revision 14766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:01:59 +00:00
Baptiste Coudurier
b5f46e9340 import ok'd hunks for mxf muxer
Originally committed as revision 14765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 21:48:02 +00:00
Kurtnoise
7139bfa8fe Surround '#include <sys/select>' by HAVE_SYS_SELECT_H.
patch by Kurtnoise, kurtnoise free fr

Originally committed as revision 14756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 14:29:18 +00:00
Anuradha Suraparaju
67a38cee37 Change Dirac in MPEG-TS encapsulation to conform with spec changes.
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 14753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 11:17:23 +00:00
Michael Niedermayer
3c9769a008 Do not fill the pts reordering buffer with guessed dts.
These values should not matter at all in principle because they
do not correspond to the time of display of any frame but it seems
ffmpeg becomes confused by them if they are far off and its not
strictly correct to set them to guessed values.
Fixes video_stalls_at_start.wmv

Originally committed as revision 14746 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 03:24:58 +00:00
Aurelien Jacobs
5df3cc6f80 matroskadec: list some more ebml IDs found in the wild and that we ignore
This avoid printing some warnings about unknow IDs while we in fact know
the IDs but just want to knowingly ignore them.

Originally committed as revision 14738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 21:15:15 +00:00
Anuradha Suraparaju
f4bba2015a Dirac encapsulation in MPEG-TS
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk

Originally committed as revision 14734 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 19:29:35 +00:00
Diego Biurrun
2485abe281 Remove unused variable.
Originally committed as revision 14731 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 18:32:16 +00:00
Aurelien Jacobs
ea452b54f0 strcasecmp() requires #include <strings.h>
Originally committed as revision 14728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 17:22:53 +00:00
Aurelien Jacobs
131f1cb2a9 matroskadec: parse available blocks even when cluster parsing failed
This way, we still read the few complete blocks out of a truncated
cluster at the end of a truncated file.

Originally committed as revision 14723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 09:36:45 +00:00
Michael Niedermayer
0e55ba723b Add needed include, make it compile without -D_BSD_SOURCE.
Originally committed as revision 14718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 21:02:37 +00:00
Baptiste Coudurier
0d84a8f6ae increase MAX_REORDER_DELAY and pts_buffer size to 16, max for h264 atm
Originally committed as revision 14715 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 17:28:00 +00:00
Baptiste Coudurier
cb5b96cde0 Prevent dts generation code to be executed when delay is > MAX_REORDER_DELAY,
this fixes overflow in AVStream->pts_buffer.

Originally committed as revision 14714 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 17:26:36 +00:00
Peter Ross
ebc22cc29f Electronic Arts demuxer: support SxEN audio tags found in 'Need for Speed: Pro Street' computer game.
Originally committed as revision 14713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 12:36:00 +00:00
Peter Ross
6819af8245 Electronic Arts demuxer: perform identification of ADPCM EA R2 codec using revision2 flag.
Originally committed as revision 14710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:35:09 +00:00
Peter Ross
a07f117804 Electronic Arts demuxer: ignore PTxx platform ID values.
Originally committed as revision 14709 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:33:32 +00:00
Peter Ross
d3302b7011 Support Electronic Arts files containing MPEG2VIDEO.
Originally committed as revision 14708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 08:32:59 +00:00
Benjamin Larsson
1b46683c80 FOURCC addition: added 3IV2, another mpeg4 id. incoming/video_3iv2/video_3iv2.avi
Originally committed as revision 14681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 15:34:29 +00:00
Peter Ross
d9d9a8c028 Add MDEC tags to Electronic Arts demuxer.
Originally committed as revision 14679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 01:58:46 +00:00
Stefano Sabatini
8163c870b0 Cosmetics: move at the beginning of the file the av_frac_* functions, avoid
the forward declarations.

Originally committed as revision 14677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-10 00:28:56 +00:00
Aurelien Jacobs
44015c56a6 matroskadec: add basic tags support (metadata)
Originally committed as revision 14672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 23:50:38 +00:00
Stefano Sabatini
c97429e22b Implement avformat_version().
Originally committed as revision 14667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-08 18:40:50 +00:00
Baptiste Coudurier
b80b569242 remove mxf.c, previously copied to mxfdec.c
Originally committed as revision 14661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-07 17:33:53 +00:00
Baptiste Coudurier
d09ea6baaf rename mxf.c to mxfdec.c
Originally committed as revision 14655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-07 02:12:14 +00:00
Måns Rullgård
5c5b1731b7 Maintain pointer to end of AVFormatContext.packet_buffer list
This changes add_to_pktbuf() to maintain a pointer to the last entry
in the list, avoiding a linear walk-through on each call.  Before this
change, add_to_pktbuf() could take a significant amount of time (10%
of total decoding time), even with input files of several minutes.
After the change, the time spent in this function is barely measurable
with oprofile.

Originally committed as revision 14654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 22:17:38 +00:00
Peter Ross
bbf020e977 Add Electronic Arts TGV chunk tags to EA demuxer.
Originally committed as revision 14643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 08:34:35 +00:00
Aurelien Jacobs
00a3431cbb matroskadec: use av_freep(&x) instead of av_free(x);x=NULL
Originally committed as revision 14633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 00:21:10 +00:00
Anton Khirnov
b87025399c matroskadec: replace matroska_queue_packet with a single call to dynarray_add
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 14632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-06 00:17:47 +00:00
Diego Biurrun
95aad5d1f1 Fix small typo.
Originally committed as revision 14628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 21:46:10 +00:00
Peter Ross
4e0e6888a4 Support muxing of Zork PCM audio into RIFF formats.
Originally committed as revision 14617 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 10:38:25 +00:00
Diego Biurrun
5968d2dd1e misc spelling/grammar fixes
Originally committed as revision 14616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 08:28:57 +00:00
Aurelien Jacobs
cc70d14b3d matroskadec: remove useless num_streams
Originally committed as revision 14611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:43:01 +00:00
Aurelien Jacobs
88cca98947 matroskadec: expand useless ebml_read_element_id() wrapper
Originally committed as revision 14610 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:58 +00:00
Aurelien Jacobs
33ac07ea08 matroskadec: simplify matroska_ebmlnum_sint()
Originally committed as revision 14609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:55 +00:00
Aurelien Jacobs
c1e01133f6 matroskadec: implement matroska_ebmlnum_uint() using ebml_read_num()
Originally committed as revision 14608 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:52 +00:00
Aurelien Jacobs
cc8be50637 matroska: expand useless define for MS compat codec id strings
Originally committed as revision 14607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:49 +00:00
Aurelien Jacobs
20fb02c5b9 matroskadec: remove useless comments in ff_mkv_codec_tags
Originally committed as revision 14606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:46 +00:00
Aurelien Jacobs
ff33c5c565 matroskadec: update copyright year and related comments
Originally committed as revision 14605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:43 +00:00
Aurelien Jacobs
737c40da20 matroskadec: reorder some functions in a more logical order
Originally committed as revision 14604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:39 +00:00
Aurelien Jacobs
1b6d23bbcb matroskadec: remove now useless wrapper ebml_read_element_length()
Originally committed as revision 14603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:36 +00:00
Aurelien Jacobs
66cfc3856c matroskadec: remove now useless wrapper ebml_read_seek()
Originally committed as revision 14602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:33 +00:00
Aurelien Jacobs
5c5373cea4 matroskadec: remove now useless peek_id
Originally committed as revision 14601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:29 +00:00
Aurelien Jacobs
3879763833 matroskadec: don't try to re-read already parsed ID in matroska_parse_cluster()
Originally committed as revision 14600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:26 +00:00
Aurelien Jacobs
6314cca006 matroskadec: remove now unused parameter 'once' from ebml_parse_nest()
Originally committed as revision 14599 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:23 +00:00
Aurelien Jacobs
c4d3d9ba95 matroskadec: directly use ebml_parse() or ebml_parse_id() where it's enough
Originally committed as revision 14598 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:20 +00:00
Aurelien Jacobs
66a37e060b matroskadec: new ebml_parse() function, centralize ebml_read_element_id() calls
Originally committed as revision 14597 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:17 +00:00
Aurelien Jacobs
9bcb92ca6b matroskadec: rename ebml_parse() to ebml_parse_nest()
Originally committed as revision 14596 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:13 +00:00
Aurelien Jacobs
c005b3f224 matroskadec: don't care about the number of bytes read by ebml_read_element_id()
Originally committed as revision 14595 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:10 +00:00
Aurelien Jacobs
592110c26c matroskadec: simplify check for hierarchy level
Originally committed as revision 14594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:08 +00:00
Aurelien Jacobs
f7b9687cbb matroskadec: cosmetics: consistent style for function declarations
Originally committed as revision 14593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:05 +00:00
Aurelien Jacobs
104be2404e matroskadec: Use string instead of char table as probe data comparison source.
Originally committed as revision 14592 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:42:02 +00:00
Aurelien Jacobs
eb05caccf2 matroskadec: use an EbmlBin as parameter to ebml_read_binary()
Originally committed as revision 14591 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:59 +00:00
Aurelien Jacobs
c6cd2b3d22 matroskadec: extract common code out of ebml_read_*()
Originally committed as revision 14590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:55 +00:00
Aurelien Jacobs
ba5a1f99cc matroskadec: simplify/cleanup error logging in ebml_read_*()
Originally committed as revision 14589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:52 +00:00
Aurelien Jacobs
54d8869d3a matroskadec: remove now useless expected_id parameter from ebml_parse()
Originally committed as revision 14588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:50 +00:00
Aurelien Jacobs
4dc9e183dd matroskadec: expand useless ebml_peek_id() wrapper
Originally committed as revision 14587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:46 +00:00
Aurelien Jacobs
3856e7c4aa matroskadec: remove unused levelup parameter from ebml_read_element_id()
Originally committed as revision 14586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:43 +00:00
Aurelien Jacobs
44cea7651b matroskadec: extract read_level_up out of ebml_read_element_id
Originally committed as revision 14585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:40 +00:00
Aurelien Jacobs
dfde36a33e matroskadec: remove useless levelup check
Originally committed as revision 14584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:37 +00:00
Aurelien Jacobs
051ef5cef5 matroskadec: remove useless check for cluster presence
Originally committed as revision 14583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:34 +00:00
Aurelien Jacobs
28ba69e097 matroskadec: cosmetics: placement of 'else if'
Originally committed as revision 14582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:31 +00:00
Aurelien Jacobs
7eb9b068eb matroskadec: remove some useless empty lines
Originally committed as revision 14581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:28 +00:00
Aurelien Jacobs
5efc8ec850 matroskadec: remove some useless or out of date comments
Originally committed as revision 14580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:25 +00:00
Aurelien Jacobs
8f35a2c022 matroskadec: cosmetics
Originally committed as revision 14579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:22 +00:00
Aurelien Jacobs
c171af9bd7 matroskadec: remove unused struct name
Originally committed as revision 14578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:19 +00:00
Aurelien Jacobs
1e49ee4270 matroskadec: remove now unused context fields
Originally committed as revision 14577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:16 +00:00
Aurelien Jacobs
70109c0d48 matroskadec: remove useless initialization
Originally committed as revision 14576 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:13 +00:00
Aurelien Jacobs
16f97ab050 matroskadec: cosmetics: remove useless braces
Originally committed as revision 14575 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:10 +00:00
Aurelien Jacobs
3143f13345 matroskadec: remove some unused ebml funcs
Originally committed as revision 14574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:07 +00:00
Aurelien Jacobs
209472b45d matroskadec: use generic parser to parse clusters
Originally committed as revision 14573 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:05 +00:00
Aurelien Jacobs
f06a488647 matroskadec: use generic parser inside matroska_execute_seekhead()
Originally committed as revision 14572 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:41:01 +00:00
Aurelien Jacobs
ce6f28bd35 matroskadec: use generic parser to parse matroska from toplevel
Originally committed as revision 14571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:58 +00:00
Aurelien Jacobs
9c25bafacb matroskadec: move context settings to matroska_read_header()
Originally committed as revision 14570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:55 +00:00
Aurelien Jacobs
d88d806bd1 matroskadec: cosmetics: indentation of matroska_read_header()
Originally committed as revision 14569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:52 +00:00
Aurelien Jacobs
9a9a3b03a6 matroskadec: move declaration to upper block
Originally committed as revision 14568 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:49 +00:00
Aurelien Jacobs
a636a56bf4 matroskadec: invert a test
Originally committed as revision 14567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:46 +00:00
Aurelien Jacobs
4348571b1a matroskadec: cosmetics: indentation of matroska_execute_seekhead()
Originally committed as revision 14566 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:43 +00:00
Aurelien Jacobs
82113343a7 matroskadec: remove useless dummy_level variable
Originally committed as revision 14565 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:40 +00:00
Aurelien Jacobs
13b350a3a4 matroskadec: use generic parser to parse seekhead
Originally committed as revision 14564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:36 +00:00
Aurelien Jacobs
8ecdab8f5a matroskadec: declare var where it's used
Originally committed as revision 14563 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:33 +00:00
Aurelien Jacobs
2cbc8811ab matroskadec: use generic parser to parse tracks
Originally committed as revision 14562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:31 +00:00
Aurelien Jacobs
29708581fc matroskadec: use generic parser to parse info
Originally committed as revision 14561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:27 +00:00
Aurelien Jacobs
b414cb892e matroskadec: use generic parser to parse attachments
Originally committed as revision 14560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:24 +00:00
Aurelien Jacobs
6bbd7c7b79 matroskadec: use generic parser to parse chapters
Originally committed as revision 14559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:21 +00:00
Aurelien Jacobs
434d496a8a matroskadec: use generic parser to parse tags
Originally committed as revision 14558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:18 +00:00
Aurelien Jacobs
e5929fdf62 matroskadec: use generic parser to parse index
Originally committed as revision 14557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:15 +00:00
Aurelien Jacobs
009ecd504e matroskadec: return pointer instead of index in matroska_find_track_by_num()
Originally committed as revision 14556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:12 +00:00
Aurelien Jacobs
28f450a992 matroskadec: create new AVStream earlier
Originally committed as revision 14555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:09 +00:00
Aurelien Jacobs
fc4d335f6d matroskadec: store an AVStream pointer instead of a stream index
Originally committed as revision 14554 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:06 +00:00
Aurelien Jacobs
6351132435 matroskadec: use generic ebml parser to parse ebml header
Originally committed as revision 14553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:02 +00:00
Aurelien Jacobs
789ed100d7 matroskadec: add an ebml generic parser
Originally committed as revision 14552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:40:00 +00:00
Aurelien Jacobs
6e35ae2a74 matroskadec: remove unused is_bframe flag
Originally committed as revision 14551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:55 +00:00
Aurelien Jacobs
4eff97439b matroskadec: simplify flag default
Originally committed as revision 14550 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:53 +00:00
Aurelien Jacobs
ead3006257 matroskadec: remove storage of various unused flags
Originally committed as revision 14549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:50 +00:00
Aurelien Jacobs
5f8e022701 matroskadec: use more robust av_strlcpy() instead of strcpy()
Originally committed as revision 14548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:39:47 +00:00
Peter Ross
51c3861e16 Add D-Cinema audio muxer
Originally committed as revision 14531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-04 07:35:07 +00:00
Baptiste Coudurier
021b8ae39b fix if/else case
Originally committed as revision 14526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 21:24:30 +00:00
Baptiste Coudurier
2288834f87 full lpcm support in mov audio stsd v2
Originally committed as revision 14524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 18:37:35 +00:00
Justin Ruggles
14b7062829 cosmetics: make all references to AC-3 capitalized and hyphenated
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 16:42:32 +00:00
Justin Ruggles
2d47c3de98 remove a comment which is no longer true
Originally committed as revision 14522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 16:41:52 +00:00
Baptiste Coudurier
aaef2bb345 support big endian lpcm with audio stsd v2
Originally committed as revision 14507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:45:23 +00:00
Baptiste Coudurier
6b477e1b71 keep original codec/fourcc endianness, fix XDCAMHD.mov
Originally committed as revision 14506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:43:36 +00:00
Baptiste Coudurier
9184d53a03 more complete audio stsd v2
Originally committed as revision 14505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:40:13 +00:00
Baptiste Coudurier
5ef3ad59f2 move version specific parsing code before codec specific code, will be needed
Originally committed as revision 14504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-02 03:35:43 +00:00
Michael Niedermayer
758af9868e Recommit r14497
Log:
	Add missing header #includes.
Limited to ffm.h & swf.h which are maintained by baptiste who requested that
version to be kept.

Originally committed as revision 14501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-01 23:12:10 +00:00
Michael Niedermayer
c5e56a813b Revert r14497
Log:
	Add missing header #includes.
Policy violation (change not approved by maintainer)
and while discussions where ongoing and no consensus has been reached.

Originally committed as revision 14500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-01 22:29:29 +00:00
Diego Biurrun
2e11268ea9 Add missing header #includes.
Originally committed as revision 14497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-01 16:29:26 +00:00
Art Clarke
138568e9da downgrade mov negative ctts log message to warning, patch by Art Clarke, aclarke at vlideshow dot com
Originally committed as revision 14492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 19:44:42 +00:00
Baptiste Coudurier
39a127bfbc Only reset buffer state if seeking is successful; update seek reg ref.
Originally committed as revision 14491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 19:40:06 +00:00
Baptiste Coudurier
d701934bef check url_fseek return value
Originally committed as revision 14490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 18:12:37 +00:00
Baptiste Coudurier
aaec4e03e9 check url_fseek return value, update seek reg tests
Originally committed as revision 14489 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 18:02:55 +00:00
Baptiste Coudurier
22e7d9cc25 skip flv video info / command frame packets, fix issue #546
Originally committed as revision 14480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 02:26:40 +00:00
Baptiste Coudurier
62f2523062 change assert test due to the new reducing of time_base in av_set_pts_info, fix #561
Originally committed as revision 14477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 21:07:54 +00:00
Peter Ross
af8ed96f45 EA Demuxer: make rev2 flag optional
Originally committed as revision 14474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 07:41:32 +00:00
Baptiste Coudurier
f07fd8c08c add a bunch of new xdcam hd422 fourccs
Originally committed as revision 14473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:55:59 +00:00
Baptiste Coudurier
7fc628cad9 more hdv fourccs
Originally committed as revision 14472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:41:12 +00:00
Baptiste Coudurier
138ef0a9a2 update hdv fourcc descriptions
Originally committed as revision 14471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-30 01:39:20 +00:00
Stefano Sabatini
c16184e9ba Fix a typo in sdp_write_header(): change "IPV4", which is not a valid
network address type, to "IP4".

Originally committed as revision 14465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-29 10:45:53 +00:00
Michael Niedermayer
452a398fd6 Fix misdetection of H.264 in mpegts as mpeg1video in mpegts.
Fixes maybeH264_dumpstream

Originally committed as revision 14445 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 23:06:22 +00:00
Stefano Sabatini
af274fd1e1 Improve long names for FFM muxer and demuxer:
change "ffm format" to "FFM (FFserver live feed) format".

Originally committed as revision 14438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 20:59:40 +00:00
Aurelien Jacobs
d3d265b288 matroska: add support for A_QUICKTIME/QDM2 codec
Originally committed as revision 14430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 15:12:00 +00:00
Aurelien Jacobs
f009e36f75 matroska: add support for V_QUICKTIME track type
Originally committed as revision 14429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-27 15:11:04 +00:00
Michael Niedermayer
01037451f9 Detect IDR less H.264 correctly.
Fixes maybeH264_dumpvideo

Originally committed as revision 14424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 18:54:26 +00:00
Peter Ross
249f324364 Support 32-bit floating point audio samples in Sun AU demuxer
Originally committed as revision 14410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-26 07:09:44 +00:00
Joakim Plate
4c8e5dfcc5 Fix handling of old nuv files where an aspect of 1 actually means 4/3
Patch by elupus (elupus ecce se)

Originally committed as revision 14382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-25 04:10:32 +00:00
Joakim Plate
3a459ebe35 aspect stored in nuv files must be converted from display- to sample-aspect.
Patch by elupus (elupus ecce se)

Originally committed as revision 14375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 18:40:43 +00:00
Diego Biurrun
ca74c0a180 cosmetics: Fix two common typos: wont --> will not, lets --> let us.
Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:09:28 +00:00
John Schmiederer
ec072669f7 Use tkhd matrix for proper display in mov.
Patch by John Schmiederer jschmiederer on2 com
Original thread: [PATCH] Use tkhd matrix for proper display in mov
Date: 05/23/2008 09:31 PM

Originally committed as revision 14365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 07:55:11 +00:00
Kostya Shishkov
327ce5e6e6 SMPTE 421M Annex L (aka .rcv) muxer
Originally committed as revision 14352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 17:06:40 +00:00
Baptiste Coudurier
f12c4bba79 add ogv extension
Originally committed as revision 14295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 03:29:16 +00:00
Baptiste Coudurier
0fb6c620c0 cosmetics, remove space
Originally committed as revision 14294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 03:27:24 +00:00
Baptiste Coudurier
9b92ed7666 update swf video frame number when muxing done, fix #439
Originally committed as revision 14293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 03:25:50 +00:00
Erik Hovland
be390a4e2e Fix a mem leak in av_find_stream_info().
Patch by Erik Hovland erik hovland org

Originally committed as revision 14276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 07:13:56 +00:00
Måns Rullgård
c6002ea14d MPEGTS: Improve probe function
When a sync byte is found, check that transport_error_indicator is zero,
and adaptation_field_control is valid (non-zero).

Originally committed as revision 14274 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 01:07:17 +00:00
Baptiste Coudurier
5469b788ea cosmetics, remove space
Originally committed as revision 14273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 00:24:31 +00:00
Baptiste Coudurier
40e7aaa384 Return max score when ftyp atom is encountered.
Originally committed as revision 14272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-18 00:23:37 +00:00
Michael Niedermayer
2615800a27 Try to fix FATE after my time_base simplification change.
Originally committed as revision 14262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-17 14:13:44 +00:00
Diego Biurrun
9e4cd83347 cosmetics: Fix mxf codec long name.
Originally committed as revision 14256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-16 17:20:21 +00:00
Siarhei Siamashka
589790c294 OGG: Add padding at end of Vorbis headers
Patch by Siarhei Siamashka <siarhei.siamashka gmail com>

Originally committed as revision 14249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-15 23:00:29 +00:00
Michael Niedermayer
154dffd04c Make flic probe check a few more things.
fixes issue399

Originally committed as revision 14235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 22:55:07 +00:00
Michael Niedermayer
744b4c02c2 Move the codec_id overriding at a slightly better place.
Originally committed as revision 14234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 20:31:17 +00:00
Michael Niedermayer
283c061936 Remove common factors from timebase in av_set_pts_info().
Should fix issue313

Originally committed as revision 14232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 19:11:09 +00:00
Diego Biurrun
fb72cf46f7 gifdec.c was removed, purge its entry from the Makefile.
Originally committed as revision 14228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-14 08:55:07 +00:00
Måns Rullgård
e8420626d0 RTP: use dprintf(), allow compilation with -DDEBUG
Originally committed as revision 14211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 19:41:10 +00:00
Måns Rullgård
f94981ea6a ASF: use dprintf(), allow compilation with -DDEBUG
Originally committed as revision 14210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 19:41:07 +00:00
Michael Niedermayer
0b54f3c087 Remove gif demuxer, the code contains a gif decoder and lzw decoder neither
belongs in a demuxer, furthermore the code might be exploitable.
Fixes issue530

Originally committed as revision 14209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 18:47:24 +00:00
Michael Niedermayer
c1c9046656 Use CODEC_ID_PROBE when the mpeg-ps demuxer does not know exactly which
video codec is used.
Fixes issue49 Departed Trailer.evo (mpeg ps missdetecting h264 as mpeg2video)

Originally committed as revision 14196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 22:17:13 +00:00
Michael Niedermayer
dd57251cb0 Remove old hackish codec probe system.
Originally committed as revision 14193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 20:40:47 +00:00
Michael Niedermayer
2a72e494c3 Use strcmp() instead of strncmp() in set_codec_from_probe_data().
Originally committed as revision 14190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 20:01:23 +00:00
Michael Niedermayer
25d3fb7374 indent
Originally committed as revision 14189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:57:57 +00:00
Michael Niedermayer
942de2f4fa Only try to probe the codec when the available data has roughly doubled
relative to the last attempt.

Originally committed as revision 14188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:57:30 +00:00
Michael Niedermayer
312d24d5e9 Add mpegvideo and H.264 to the codec probe.
Originally committed as revision 14187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:56:25 +00:00
Michael Niedermayer
010acd8ea1 h264_probe()
Originally committed as revision 14186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 19:50:48 +00:00
Michael Niedermayer
55823964dc indent
Originally committed as revision 14185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 18:43:02 +00:00
Michael Niedermayer
0bef08e516 New codec probing system try #1.
Originally committed as revision 14184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 18:42:00 +00:00
Michael Niedermayer
3e86dba24b command_streams are type data not unknown.
Originally committed as revision 14183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 16:43:46 +00:00
Michael Niedermayer
9d3b9f2cce Move add_to_pktbuf() before av_read_packet(). My future work on codec identification
cleanup will need this.

Originally committed as revision 14181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 14:28:27 +00:00
Michael Niedermayer
64cd3108df Move set_codec_from_probe_data() up to where the other probe functions are.
Originally committed as revision 14180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 13:25:26 +00:00
Michael Niedermayer
3179da621a Pass AVPacketList instead of the whole context to add_to_pktbuf as that is
all that is needed.

Originally committed as revision 14179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-12 13:15:00 +00:00
Michael Niedermayer
876ef93d99 simplify
Originally committed as revision 14168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 15:12:44 +00:00
Michael Niedermayer
6e264d45bc Fix misdetection of MPEG-PS (AVSEQ03.DAT and AVSEQ06.DAT) as psxstr.
Originally committed as revision 14167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 15:10:58 +00:00
Diego Biurrun
58607ca7d2 Move one function that is only used for muxing below #ifdef CONFIG_MUXERS.
Originally committed as revision 14164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:41:11 +00:00
Diego Biurrun
37673b1bdd Move a function and an #ifdef CONFIG_MUXERS so that functions used only for
muxing get disabled when compiling with --disable-muxers.

Originally committed as revision 14163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:39:33 +00:00
Diego Biurrun
66b32ce8d0 Move functions only used for muxing below #ifdef CONFIG_YUV4MPEGPIPE_MUXER,
fixes some warnings when compiling with muxers disabled.

Originally committed as revision 14162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-11 07:37:22 +00:00
Anuradha Suraparaju
eb64714c3a Add entry for Dirac codec.
Patch by Anuradha Suraparaju anuradha rd bbc co uk

Originally committed as revision 14151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-10 11:41:06 +00:00
Luca Abeni
80150f7ee8 Fix MPEG video packetization for RTP
Originally committed as revision 14149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-10 07:40:54 +00:00
Gregory Montoir
5b8cc860a1 Motion Pixels MVI Demuxer.
Patch by Gregory Montoir <cyx <at> users <dot> sourceforge <dot> net>

Originally committed as revision 14147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-10 03:02:19 +00:00
Michael Niedermayer
cdb5af79e3 indent
Originally committed as revision 14133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:26:26 +00:00
Michael Niedermayer
7efeb73a5a 10000l for myself, my last change was incomplete.
This one also reverts the libav mpeg ts regression test score change.

Originally committed as revision 14132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:25:01 +00:00
Erik Hovland
72e043dd0f One-bit bitfields should probably be unsigned. Unfortunately, it is left
up to the compiler on how one bit fields are treated. gcc treats one-bit
bitfields as signed and allows for the -funsigned-field parameter. Other
compilers (like Sun C) treat one-bit bitfields as unsigned no matter what.
Patch by Erik Hovland erik hovland org

Originally committed as revision 14131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 23:20:22 +00:00
Michael Niedermayer
6d77d9acf7 Set cur_dts to 0 only during creating new streams and not every time cur_dts happens
to be AV_NOPTS_VALUE.

Originally committed as revision 14118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 14:07:37 +00:00
Peter Ross
b2f181c270 Electronic Arts CMV demuxer
Originally committed as revision 14111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 13:24:13 +00:00
Peter Ross
60f451b6fe Remove AVPaletteControl from ALG MM demuxer/decoder
Originally committed as revision 14109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 12:44:08 +00:00
Luca Abeni
f6f848397a Remove outdated comment
Originally committed as revision 14107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 08:22:16 +00:00
Stefano Sabatini
265fccccde Print libavformat version in outgoing SDPs.
Originally committed as revision 14106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-08 07:05:57 +00:00
Reimar Döffinger
00496302d6 10l, fix nuv_header for the case when there is no video stream.
Originally committed as revision 14101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 16:30:39 +00:00
Diego Biurrun
76d3242835 Alphabetically order AVInputFormat/AVOutputFormat declarations.
Originally committed as revision 14100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 11:11:08 +00:00
Diego Biurrun
900eb63dd3 Add a note to remind people to add new raw formats to the Makefile.
Originally committed as revision 14099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 10:45:36 +00:00
Diego Biurrun
0c7b4823b3 Add missing dependency declaration for raw Dirac demuxer.
Originally committed as revision 14098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 10:44:34 +00:00
Diego Biurrun
ac1ea66e17 spelling cosmetics in PCM codec long names
Originally committed as revision 14097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-07 10:37:18 +00:00
Aurelien Jacobs
92b2bc59c9 add some missing dependencies
Originally committed as revision 14095 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 20:48:47 +00:00
Gregory Montoir
ca3ed63e15 Remove inaccurate computation of pts for audio packets and rely on
libavformat to generate them.
patch by Gregory Montoir, cyx users sourceforge net

Originally committed as revision 14085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 10:00:12 +00:00
Michael Niedermayer
0328995893 All mp3 parsers are buggy fix 2 of n (out of array write, i suspect not exploitable)
Originally committed as revision 14070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:04:41 +00:00
Michael Niedermayer
d5ae45841f All id3 parsers are buggy, 0 termination fix 1 of n (issue created by andreas
and found by reimar) fix is from reimar + cosmetics by me.

Originally committed as revision 14069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 22:00:35 +00:00
Diego Biurrun
15d6e3612f spelling cosmetics
Originally committed as revision 14064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-04 13:05:06 +00:00
Ronald S. Bultje
1e2802c5cf Reindent after r14059, see "[PATCH] allow empty params for
av_open_input_stream()".

Originally committed as revision 14060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-03 12:12:03 +00:00
Ronald S. Bultje
e145ce2027 Allow NULL for read_header in AVInputFormat. See discussion in "[PATCH] allow
empty params for av_open_input_stream()".

Originally committed as revision 14059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-03 12:10:54 +00:00
Luca Abeni
fba7815d8d Reindent after last commit
Originally committed as revision 14046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-02 10:26:23 +00:00
Luca Abeni
d6b9e57af2 Fix A/V synch for RTP streams that do not contain MPEG1 or 2
(correctly compute the presentation times based on the RTP timestamps
and the RTCP SR packets)

Originally committed as revision 14045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-02 10:23:27 +00:00
Baptiste Coudurier
90ffc4902e include track id in error message
Originally committed as revision 14025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 20:32:37 +00:00
Reimar Döffinger
ddca6ab678 Change mtv_read_packet so it does not break after seeking (displaying a shifted image).
Originally committed as revision 14020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 09:01:16 +00:00
Reimar Döffinger
34bfe875d5 Fix pkt->pos to really point at start of packet for mtv audio packets.
Originally committed as revision 14019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 08:59:02 +00:00
Baptiste Coudurier
6f557c6a36 cosmetics
Originally committed as revision 14018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 04:54:39 +00:00
Baptiste Coudurier
c7adbedb08 cosmetics, align vertically
Originally committed as revision 14017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-28 04:53:01 +00:00
Baptiste Coudurier
c187f461f5 unset Track sets, relying in AVStream->priv_data and will be freed in av_close_input_file
Originally committed as revision 14016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:43:15 +00:00
Stefan Gehrer
6d083dd7e9 fix size of header data
Originally committed as revision 14015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 21:42:08 +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
150611474e give context to av_log
Originally committed as revision 14012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 19:00:04 +00:00
Luca Abeni
6872368355 Do not free the priv_data field of AVStream on close (it is already
freed by av_close_input_stream())

Originally committed as revision 14006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-27 11:55:25 +00:00
Michael Niedermayer
44369b45eb indent
Originally committed as revision 14005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:06:10 +00:00
Michael Niedermayer
fd147f23a2 Inform the user about unhandled sectors.
Originally committed as revision 14004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:05:21 +00:00
Michael Niedermayer
66602c67be memleak
Originally committed as revision 14003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:02:42 +00:00
Michael Niedermayer
435a6082f9 Do not completely bail out for invalid params, just skip the current sector.
Originally committed as revision 14002 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 23:00:00 +00:00
Michael Niedermayer
ad9c10556c merge decl & init
Originally committed as revision 14001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:55:39 +00:00
Michael Niedermayer
a4fe6826de Get rid of weird pre reading code.
Originally committed as revision 14000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:53:43 +00:00
Michael Niedermayer
d0b76b98c4 Remove debugging trash.
Originally committed as revision 13999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:45:19 +00:00
Michael Niedermayer
7669935ac4 Another variable that did nothing at all
Originally committed as revision 13998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:43:18 +00:00
Michael Niedermayer
73d3a14d82 remove code that discards streams randomly
Originally committed as revision 13997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:42:13 +00:00
Michael Niedermayer
e100245441 vertical align
Originally committed as revision 13996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:30:14 +00:00
Michael Niedermayer
c1f6eca124 Remove a dozen unused variables.
Originally committed as revision 13995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:28:58 +00:00
Michael Niedermayer
a4d64c1709 unused var
Originally committed as revision 13994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:23:57 +00:00
Michael Niedermayer
fdb5932e35 Fix exploitable code.
Fixes issue311

Originally committed as revision 13993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 22:22:10 +00:00
Michael Niedermayer
dd7a68b6da Remove start_time guessing code.
Originally committed as revision 13988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 13:42:26 +00:00
Michael Niedermayer
3041a4a13d Also print flags with FF_FDEBUG_TS.
Originally committed as revision 13987 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-26 11:28:24 +00:00
Michael Niedermayer
f53dd4682c Prevent invalid timestamps from being stored.
Originally committed as revision 13983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 22:37:26 +00:00
Benjamin Larsson
75d27450a1 Add support for mp3 contained in oma
Originally committed as revision 13980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:59:52 +00:00
Benjamin Larsson
de8c8181a9 Rearrange parameter logic
Originally committed as revision 13979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:57:57 +00:00
Benjamin Larsson
f035fe9755 Add more codec IDs and tags.
Originally committed as revision 13977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:39:38 +00:00
Baptiste Coudurier
f3b5a1a260 make av_find_stream_info find frame_size for aac too
Originally committed as revision 13976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 19:30:48 +00:00
Michael Niedermayer
4d35bf74f9 Make av_find_stream_info() find the frame_size for vorbis.
Originally committed as revision 13972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:36:41 +00:00
Michael Niedermayer
6e1aa0f383 Fill missing pts in during muxing when we know that they are equal to dts.
Originally committed as revision 13970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:31:48 +00:00
Michael Niedermayer
c924ca78b6 We cannot calculate the duration of vorbis packets even if we do know the
"minimal" frame_size.

Originally committed as revision 13969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 18:15:04 +00:00
Luca Abeni
a4696aa2fe Remove improper usage of AV_TIME_BASE_Q
Originally committed as revision 13960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-25 11:55:57 +00:00
Michael Niedermayer
796d200a77 Prevent duration calculation code from generating random durations for
vorbis in ogg.

Originally committed as revision 13958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 23:56:16 +00:00
Luca Abeni
309d32b0db Do not set sample_rate = 90000 for mp2 and mp3 audio over RTP
Originally committed as revision 13943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-24 11:07:04 +00:00
Diego Biurrun
07cb073bf9 Remove unused variable, fixes the warning:
libavformat/rmdec.c:280: warning: unused variable 'i'

Originally committed as revision 13909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-23 08:52:44 +00:00
Baptiste Coudurier
d4fdba0df7 chinese avs demuxing support, demux AVSFileFormat.mp4
Originally committed as revision 13899 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 23:52:57 +00:00
Evgeniy Stepanov
5e8477b011 matroskadec: decode track private data if needed
original patch by Evgeniy Stepanov  eugeni.stepanov _at_ gmail _dot_ com

Originally committed as revision 13892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:52:28 +00:00
Evgeniy Stepanov
935ec5a1d5 matroskadec: move buffer decoding code to a separate function
original patch by Evgeniy Stepanov  eugeni.stepanov _at_ gmail.com

Originally committed as revision 13891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:49:44 +00:00
Aurelien Jacobs
51e1cc16d3 matroskadec: fix a memory leak
Originally committed as revision 13890 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:46:36 +00:00
Baptiste Coudurier
fabb990ec2 cosmetics, pts->dts
Originally committed as revision 13881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 08:53:44 +00:00
Baptiste Coudurier
148c8d8018 store dts in ffm headers
Originally committed as revision 13880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 08:50:57 +00:00
Baptiste Coudurier
5e5f75cf8a remove pts set hack, this is no more correct
Originally committed as revision 13879 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 08:44:58 +00:00
Baptiste Coudurier
dbedf2aae2 enable feeder threads
Originally committed as revision 13868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 01:35:43 +00:00
Baptiste Coudurier
54e5cf132d do not reset ffm pts, this avoids setting last pts to 0 and screwing up seeking
Originally committed as revision 13856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 00:26:25 +00:00
Baptiste Coudurier
ade8d8b939 uniformize AVStream->priv_data freeing in av_close_input_stream
Originally committed as revision 13838 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:22:56 +00:00
Baptiste Coudurier
ccafd47251 factorize read_header failure freeing code
Originally committed as revision 13837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 17:16:56 +00:00
Art Clarke
6919e54c00 Check if there is at least a stream before writing trailer.
Patch by Art Clarke: aclarke vlideshow com

Originally committed as revision 13836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-20 07:27:44 +00:00
Baptiste Coudurier
9b64a036c0 remove useless close funcs
Originally committed as revision 13835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 23:25:04 +00:00
Baptiste Coudurier
2562ccb38d remove useless close func
Originally committed as revision 13834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 22:58:13 +00:00
Baptiste Coudurier
6a862b4947 remove useless close func
Originally committed as revision 13833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 22:57:00 +00:00
Baptiste Coudurier
9f5d3b13cf ffm has no per stream priv_data anymore
Originally committed as revision 13832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 22:50:17 +00:00
Luca Abeni
e917464155 Fix neverending loop which might happen when sending high-bitrate MPEG2
video over RTP

Originally committed as revision 13813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-19 10:31:45 +00:00
Florian Echtler
25176d6e22 Parse 'dats' as data.
Patch by Florian Echtler: floe butterbrot org

Originally committed as revision 13801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-18 09:03:38 +00:00
Art Clarke
e3ec60d82a free private streamcontext when closing demuxer, fix memory leak, patch by Art Clarke, aclarke at vlideshow dot com
Originally committed as revision 13800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-18 08:30:50 +00:00
Aurelien Jacobs
ded4241bb0 matroskadec: remove some useless code
Originally committed as revision 13783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-16 23:11:02 +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
Joakim Plate
de6a9a2673 matroskadec: set cur_dts after seek
patch by elupus   elupus _at_ ecce _dot_ se

Originally committed as revision 13748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-11 19:54:17 +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
Michael Niedermayer
45b2b05f8e Make timestamp debugging work nicer.
Originally committed as revision 13728 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 13:38:56 +00:00
Albert Astals Cid
e785efc49a Fix compilation with -DDEBUG, patch by Albert Astals Cid, aastals tv-wan es.
Originally committed as revision 13727 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 08:44:45 +00:00
Baptiste Coudurier
83657f9f1c remove now unneeded vars
Originally committed as revision 13726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 07:43:59 +00:00
Baptiste Coudurier
3c6a9f66b9 pass dts and pts through ffm, should fix streaming b frames
Originally committed as revision 13725 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 07:43:14 +00:00
Baptiste Coudurier
7080cbe2c8 pass extradata through ffm
Originally committed as revision 13721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 00:36:27 +00:00
Baptiste Coudurier
3438d82d4b remove ugly ffm_nopts hack, use AVFormatContext->timestamp
Originally committed as revision 13718 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-09 00:24:29 +00:00
Benjamin Larsson
b339f0c6be Oma demuxer
Originally committed as revision 13712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 17:12:25 +00:00
Baptiste Coudurier
2940b38ef2 fix pts handling in ffm
Originally committed as revision 13683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 00:49:03 +00:00
Baptiste Coudurier
c07d64c890 Reset reading state after successful seek.
Originally committed as revision 13682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 00:35:37 +00:00
Ramiro Polla
15d856e8d2 Remove wrappers of pcm_read_seek().
Last commit missed one file.

Originally committed as revision 13681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 21:54:07 +00:00
Ramiro Polla
5256e42c0b Remove wrappers of pcm_read_seek().
Originally committed as revision 13680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 21:53:03 +00:00
Baptiste Coudurier
b30bb5357d cosmetics, rename first to header, more explicit name
Originally committed as revision 13677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 20:36:16 +00:00
Baptiste Coudurier
a1011180d5 cosmetics, rename first to header, more explicit name
Originally committed as revision 13676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 20:14:47 +00:00
Diego Biurrun
969f949300 Remove Fabrice's copyright from the Makefiles. They have been entirely
rewritten since they were originally created.

Originally committed as revision 13675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:50:32 +00:00
Ramiro Polla
bea91b8c29 Remove useless img_read_close().
Originally committed as revision 13674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:02:06 +00:00
Ramiro Polla
2377922192 Remove unneeded NULL at end of struct.
Originally committed as revision 13673 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 17:00:28 +00:00
Ramiro Polla
fc9c2d53c3 Merge declaration and initialization.
Originally committed as revision 13672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-06 16:53:01 +00:00
Stefano Sabatini
ffa5ed2464 cosmetics: s/Id/id/ in libavformat where Id refers to id Software.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-05 15:03:55 +00:00
Aurelien Jacobs
03b9d94e86 matroskadec: remove some useless code
Originally committed as revision 13659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:24:55 +00:00
Aurelien Jacobs
e9b56825be cosmetics: indentation
Originally committed as revision 13658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:15:08 +00:00
Aurelien Jacobs
fc4738ae96 matroskadec: don't remove dummy level when none was added
Originally committed as revision 13657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 23:11:47 +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
Aurelien Jacobs
ca162a5004 Ensure the first audio stream is selected as the default stream
when no video stream is present.

Originally committed as revision 13648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:19:43 +00:00
Aurelien Jacobs
401cdd519c adjust comment to reality
Originally committed as revision 13647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:14:21 +00:00
Aurelien Jacobs
94f6c011d6 matroskadec: sane default value for track->time_scale
Originally committed as revision 13646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 15:09:30 +00:00
Baptiste Coudurier
d3ad044ad5 add pretty common .m2t as ts extension
Originally committed as revision 13642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 00:55:05 +00:00
Baptiste Coudurier
3654a16dc9 fix continuity counter to start at 0
Originally committed as revision 13641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 00:53:33 +00:00
Michael Niedermayer
820ad60cd9 Make update_initial_durations() also work if a dts occured before a
sequence header (that is a few known dts/pts but no known durations
previously)
cnnts1.mpg is one sample affected by this.

Originally committed as revision 13640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 00:50:22 +00:00
Michael Niedermayer
5853423c3f Do not set pts in update_initial_durations() if stream has b frames.
Originally committed as revision 13639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-03 00:43:56 +00:00
Aurelien Jacobs
ff2c222c37 matroskadec: fix potential mem leak
may or may not fix CID134 and CID135

Originally committed as revision 13636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:37:14 +00:00
Aurelien Jacobs
34ae40971b matroskadec: avoid potential mem leak
fix CID120

Originally committed as revision 13635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:27:14 +00:00
Aurelien Jacobs
fe53fa253f reorganize matroska_add_stream() to fix potential mem leak and buffer overflow
fix CID44

Originally committed as revision 13634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:07:41 +00:00
Aurelien Jacobs
4b3dc529f5 matroskadec: move ARRAY_SIZE() macro at top of the file
Originally committed as revision 13633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 23:01:14 +00:00
Andreas Öman
1686cce6e6 Audio channels and sample rate must be set in order to skip
additional probing of a stream.

Originally committed as revision 13619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 09:15:04 +00:00
Baptiste Coudurier
c5577c403f rename last_frame_offset to next_frame_offset, due to r13615
Originally committed as revision 13618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-02 04:08:30 +00:00
Panagiotis Issaris
437fd77b05 Check whether the memory allocation for extradata succeeded. Fixes issue 472.
Originally committed as revision 13603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 16:25:05 +00:00
Aurelien Jacobs
934b910ba0 matroskadec: use the proper timestamp scaling for index entries
Originally committed as revision 13602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 14:41:53 +00:00
Anton Khirnov
7ff9708585 matroskadec: read TrackTimecodeScale and set timebase accordingly
patch by Anton Khirnov   wyskas _at_ gmail _dot_ com

Originally committed as revision 13601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 13:54:11 +00:00
Anton Khirnov
cdae8eec10 matroskadec: silently discard some element ID that we don't care about
patch by Anton Khirnov   wyskas _at_ gmail _dot_ com

Originally committed as revision 13600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-01 13:39:54 +00:00
Peter Ross
750066ea1c flvenc.o depends on avc.o (for H.264 support functions).
patch by Peter Ross, pross xvid org

Originally committed as revision 13574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 14:26:56 +00:00
Ramiro Polla
16e861e3ee raw mlp demuxer
Based on patch by Jeff Muizelaar <jrmuizel <at> gmail.org>
http://article.gmane.org/gmane.comp.video.ffmpeg.devel/57797

Originally committed as revision 13558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 16:05:56 +00:00
Quoc Cuong Pham
dd0f776c98 Detect "tif" suffix as TIFF.
Patch by Quoc Cuong Pham: Quoc-Cuong D PHAM AT cea D fr

Originally committed as revision 13557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-30 13:26:40 +00:00
Reimar Döffinger
e8bd16a5e1 Check av_new_stream return value, fixes CID75 RUN2
Originally committed as revision 13536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 15:59:14 +00:00
Michael Niedermayer
8b9c4ad237 ENOMEM is better, yes ...
Originally committed as revision 13535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 15:40:16 +00:00
Reimar Döffinger
60583fb653 Check av_new_stream return value, fixes CID79 RUN2
Originally committed as revision 13534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 15:25:45 +00:00
Reimar Döffinger
6c10281c3a Check for av_new_stream failure, fixes CID76 RUN2
Originally committed as revision 13533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 15:22:45 +00:00
Erik Hovland
f094b6627d Remove unnecessary header #includes.
Extracted from a patch by Erik Hovland, erik hovland org.

Originally committed as revision 13531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 13:40:43 +00:00
Joakim Plate
5faf168940 Check return of url_fseek in mpeg timestamp reading code.
Patch by Joakim elupus ecce se

Originally committed as revision 13527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 09:50:17 +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
Baptiste Coudurier
c2acba13a4 check if extradata comes from mp4 and assume bitsteam is already formated, should fix streamcopy
Originally committed as revision 13516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-29 00:35:23 +00:00
Michael Niedermayer
5a96cd64de memleak / CID124 RUN2
Originally committed as revision 13512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 22:26:35 +00:00
Baptiste Coudurier
57783b07a0 use av_fifo_generic_write, old func is deprecated
Originally committed as revision 13511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 22:00:45 +00:00
Michael Niedermayer
9bf8b5621a Dead code removal, fixes CID59 RUN2.
Originally committed as revision 13509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 21:22:08 +00:00
Michael Niedermayer
e88b67de6c Removing dead code, fixes CID4 RUN2.
Originally committed as revision 13507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 21:14:10 +00:00
Michael Niedermayer
ea813b44a8 remove != 0
Originally committed as revision 13503 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 20:33:22 +00:00
Michael Niedermayer
591944cd0c Do a little more checking.
Originally committed as revision 13502 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 20:30:42 +00:00
Michael Niedermayer
e1dd8ac744 Do not read from after the table, fixes CID108 RUN2.
Originally committed as revision 13501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 20:28:48 +00:00
Michael Niedermayer
884d53855d Null pointer check / CID26.
Originally committed as revision 13488 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 01:57:19 +00:00
Michael Niedermayer
7a7718e38f useless
Originally committed as revision 13486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 01:53:23 +00:00
Michael Niedermayer
fce88d52ca Fixes NULL pointer dereference CID66
Originally committed as revision 13483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 00:10:34 +00:00
Michael Niedermayer
9d4cd3bfd5 Tell the user if a AVI is non interleaved.
Originally committed as revision 13482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 00:07:41 +00:00
Baptiste Coudurier
efb533312f use internal video frame number
Originally committed as revision 13479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 22:37:54 +00:00
Baptiste Coudurier
f2ecb775a7 cosmetics
Originally committed as revision 13478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 22:34:31 +00:00
Baptiste Coudurier
003ae66086 simplify, use pointer to codec context in struct instead of only id
Originally committed as revision 13477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 22:31:26 +00:00
Baptiste Coudurier
92f76fbf23 simplify, use pointer to codec context in struct instead of only id
Originally committed as revision 13476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 22:31:09 +00:00
Michael Niedermayer
5e5c908691 redundant check--
Originally committed as revision 13474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 21:44:42 +00:00
Michael Niedermayer
c2a3dcaf25 Fix memleak, fixed CID123.
Originally committed as revision 13472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 20:48:27 +00:00
Michael Niedermayer
406a0fdcab Do not use the pts/dts calculation code which needs a parser, when no parser
is available.

Originally committed as revision 13470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 18:43:25 +00:00
Baptiste Coudurier
ed03be6c49 use AVFifoBuffer
Originally committed as revision 13462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 04:33:48 +00:00
Baptiste Coudurier
2aaf590b17 cosmetics
Originally committed as revision 13461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 03:42:55 +00:00
Baptiste Coudurier
11dae3365a merge init and declaration
Originally committed as revision 13460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 03:41:51 +00:00
Baptiste Coudurier
4a712c3378 simplify and use version instead
Originally committed as revision 13459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 03:11:31 +00:00
Baptiste Coudurier
6ef445fede simplify
Originally committed as revision 13458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 03:00:40 +00:00
Baptiste Coudurier
8d4f0e6749 simplify
Originally committed as revision 13457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 02:57:48 +00:00
Baptiste Coudurier
9caf6781ed cosmetics, remove useless cases and braces
Originally committed as revision 13456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 02:55:34 +00:00
Baptiste Coudurier
1234da4caf use av_fifo_generic_write, old func is deprecated
Originally committed as revision 13455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 01:26:22 +00:00
Baptiste Coudurier
fbcb081161 remove const qualifier, removes warning:
libavformat/file.c:99: warning: passing argument 2 of 'strtol' from incompatible pointer type

Originally committed as revision 13454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 01:19:19 +00:00
Baptiste Coudurier
a077f3bc1a typo
Originally committed as revision 13448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:59:28 +00:00
Diego Biurrun
f4433de9ef consistency cosmetics: indices --> indexes
Originally committed as revision 13444 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 23:14:25 +00:00
Baptiste Coudurier
04fd3e8134 aac and h264 in flv demuxing
Originally committed as revision 13439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 22:01:41 +00:00
Baptiste Coudurier
f23496b562 aac and h264 in flv muxing
Originally committed as revision 13438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 22:00:35 +00:00
Baptiste Coudurier
391872e467 aac chan config is 0 if bitstream contains program_config_element
Originally committed as revision 13437 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 21:52:54 +00:00
Michael Niedermayer
2be83b96b6 Support non interleaved avi with phantom streams.
Originally committed as revision 13436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 20:29:16 +00:00
Baptiste Coudurier
8999c833d1 replace printf by av_log
Originally committed as revision 13425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 04:40:22 +00:00
Baptiste Coudurier
a299832f52 use av_hex_dump_log
Originally committed as revision 13424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 04:38:46 +00:00
Baptiste Coudurier
ff978de47c use dprintf
Originally committed as revision 13423 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 04:34:29 +00:00
Baptiste Coudurier
376aefddad cosmetics, add demuxer word
Originally committed as revision 13422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:57:07 +00:00
Baptiste Coudurier
58c37c30b4 cosmetics, remove useless dot
Originally committed as revision 13421 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:56:43 +00:00
Baptiste Coudurier
eea2f032ad return error if frame_offset is negative, prevent segfault
Originally committed as revision 13420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:53:48 +00:00
Baptiste Coudurier
e5ece1831a return error if len is negative, prevent segfault
Originally committed as revision 13419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:53:10 +00:00
Baptiste Coudurier
278f987a33 move ffserver specific functions up and only include unistd.h in this case
Originally committed as revision 13418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:52:14 +00:00
Baptiste Coudurier
a1e01307ad move ffm_seek1 before get_pts function since func uses it
Originally committed as revision 13417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:50:25 +00:00
Baptiste Coudurier
4adcbbbeef move DEBUG_SEEK definition before get_pts since func uses it
Originally committed as revision 13416 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:47:56 +00:00
Baptiste Coudurier
979b1a0611 move get_pts function to avoid useless declaration
Originally committed as revision 13415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:47:07 +00:00
Baptiste Coudurier
ce2b665b3d remove unneeded include
Originally committed as revision 13414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:46:06 +00:00
Baptiste Coudurier
85a6b01da4 split ffm de/muxer
Originally committed as revision 13413 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:44:31 +00:00
Baptiste Coudurier
ba26712b5c reenable test, data is available in this case
Originally committed as revision 13412 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 03:37:01 +00:00
Justin Ruggles
b2677aa2a1 parse audio in ogm demuxer.
fixes issue165.

Originally committed as revision 13407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 00:45:02 +00:00
Michael Niedermayer
c8b9377d15 Make ac3 in avi work better.
fixes issue355.

Originally committed as revision 13406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-26 00:05:30 +00:00
Michael Niedermayer
fa3b98182d Ensure that one can store X bytes in a fifo of size X.
Fixed issue417.

Originally committed as revision 13405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 23:04:09 +00:00
Michael Niedermayer
0871ae1a93 Make av_fifo*_read() ignore the available amount of data.
This is more efficient as in practice the check is redundant most of the
time. Callers which do not know if enough data is available have to check
it with av_fifo_size(). Doing the check in *read() means the caller has
no choice to skip the check when its known to be redundant.
Also the return value was never documented in a public header so
changing it should not break the API. Besides this fixes the case where
read() failed on a 100% full fifo.

Originally committed as revision 13404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 22:20:39 +00:00
Baptiste Coudurier
a9ee86e79b set correct duration when using b frames
Originally committed as revision 13372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 01:22:06 +00:00
Aurelien Jacobs
c2c3dedf6e compute the end of all chapters when end is not specified in the container
Originally committed as revision 13363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 21:44:29 +00:00
Aurelien Jacobs
ebea1d7668 cosmetics: indentation
Originally committed as revision 13280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 12:56:05 +00:00
Aurelien Jacobs
570745cc51 remove useless title check
Originally committed as revision 13279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 12:55:36 +00:00
Baptiste Coudurier
5366f15d05 simplify, remove useless vars
Originally committed as revision 13270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 00:03:00 +00:00
Baptiste Coudurier
fbabb0c277 add new h264 and aac flv ids
Originally committed as revision 13269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 22:02:29 +00:00
Baptiste Coudurier
7ef94d221b in flv this field is dts finally
Originally committed as revision 13268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 21:51:33 +00:00
Baptiste Coudurier
19719bc631 flv use 32 bit pts
Originally committed as revision 13267 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 21:47:30 +00:00
Michael Niedermayer
abd2256dbe Pass time_base as argument to new_chapter() as well.
This fixes the wrong timebase the matroska demuxer had after my previous commits.
Maybe we should reduce new_chapter() to just (AVFormatContext, int id) ?

Originally committed as revision 13266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 18:15:13 +00:00
Michael Niedermayer
f6e76ba476 Document pts/dts.
Originally committed as revision 13265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 17:56:45 +00:00
Michael Niedermayer
b18a4ab2ae Warn user about invalid timestamps.
Originally committed as revision 13264 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 17:52:42 +00:00
Michael Niedermayer
883fe4d5bb Chapter demuxing support. (untested as I have no nuts with chapters)
Isn't that much simpler than Matroska?

Originally committed as revision 13263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:52:54 +00:00
Michael Niedermayer
5c37f43a0d Make ff_new_chapter() return AVChapter instead of int so its consistant with
av_new_program() and its simpler to set other fields in AVChapter which arent
set by ff_new_chapter().

Originally committed as revision 13262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:14:11 +00:00
Michael Niedermayer
fbabf1e944 nb_chapters should be unsigned
Originally committed as revision 13261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:08:44 +00:00
Michael Niedermayer
7c8202cc92 s/num_chapters/nb_chapters/ all other similar variables are called nb_*.
Originally committed as revision 13260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:07:58 +00:00
Michael Niedermayer
747fb6c60c vertical align
Originally committed as revision 13259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:04:12 +00:00
Michael Niedermayer
42720ee4d0 indent
Originally committed as revision 13258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:03:52 +00:00
Michael Niedermayer
0dac708e2d remove useless title check
Originally committed as revision 13257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:03:32 +00:00
Michael Niedermayer
6b43e2c7d3 indent
Originally committed as revision 13256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:03:04 +00:00
Michael Niedermayer
7a2a3e8e40 Add id to AVChapter, untested (where do i find matroska files with chapters?).
Originally committed as revision 13255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 13:02:27 +00:00
Michael Niedermayer
8931e7b48a clarify start/end timebase
Originally committed as revision 13254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 12:45:03 +00:00
Michael Niedermayer
c2fb6be4a6 align comments
Originally committed as revision 13253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 12:44:12 +00:00
Michael Niedermayer
d2974f1676 chapter id and timebase
Originally committed as revision 13252 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 12:43:33 +00:00
Aurelien Jacobs
30897e764a don't set a dummy chapter title when title is unknown
Originally committed as revision 13249 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 11:47:11 +00:00
Aurelien Jacobs
842ffee386 cosmetics: indentation
Originally committed as revision 13248 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 11:46:05 +00:00
Aurelien Jacobs
1ba056b689 allows adding chapters with NULL title
Originally committed as revision 13247 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-23 11:45:30 +00:00
Aurelien Jacobs
ad9d62ef22 matroskadec: allows inserting chapters with unspecified end
Originally committed as revision 13242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 23:04:02 +00:00
Anton Khirnov
f5275b3ce7 demux chapters out of matroska
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 13241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 22:07:09 +00:00
Anton Khirnov
79d7836a5e add support for chapters definition in lavf
patch by Anton Khirnov  wyskas _at_ gmail _dot_ com

Originally committed as revision 13240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 22:00:21 +00:00
Albert Astals Cid
6f04eb1e8a free moov and cmov when error occurs, fix memleak, patch by Albert Astals Cid, aastals at tv-wan dot es
Originally committed as revision 13237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-22 17:16:12 +00:00
Baptiste Coudurier
217e2f4679 remove useless var
Originally committed as revision 13230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 22:54:36 +00:00
Baptiste Coudurier
42b9f45c0d 10l, fix compilation
Originally committed as revision 13229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 22:53:52 +00:00
Baptiste Coudurier
5dae74e095 use duration from pkt
Originally committed as revision 13228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 22:52:21 +00:00
Baptiste Coudurier
56b8a7b72a simplify
Originally committed as revision 13227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 22:49:48 +00:00
Baptiste Coudurier
252c189bc4 simplify
Originally committed as revision 13226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 22:48:33 +00:00
Baptiste Coudurier
2ea2340e34 check pkt stream index before returning packet, prevent segfault
Originally committed as revision 13224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 21:04:42 +00:00
Carl Eugen Hoyos
392f227393 Do not loop endlessly if converting into dv with timestamps Jan 1st not
immediately following a lapyear.

Patch by babupillai.
Fixes issue 443.

Originally committed as revision 13207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 07:05:08 +00:00
Lars Täuber
4860abb116 support dvd pcm 20/24 bits, patch by Lars Täuber, lars.taeuber gmx net
Originally committed as revision 13206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-21 02:26:42 +00:00
Baptiste Coudurier
3e67f255a4 remove useless/obsolete comments
Originally committed as revision 13205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-20 23:39:07 +00:00
Baptiste Coudurier
ad0b44b31a remove useless close function
Originally committed as revision 13204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-20 23:32:22 +00:00
Baptiste Coudurier
3b35f4ab51 split swf de/muxer
Originally committed as revision 13203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-20 23:31:10 +00:00
Baptiste Coudurier
585dac65db only print debug info when sample is actually added
Originally committed as revision 13202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-20 02:24:02 +00:00
Baptiste Coudurier
285a3da9bd warn about multiple fourcc
Originally committed as revision 13201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-20 02:22:44 +00:00
Baptiste Coudurier
978677a779 demux all stsd ids if codec is the same, fix premature_mov_ending.mov, closes #451
Originally committed as revision 13200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-20 02:21:29 +00:00
Aurelien Jacobs
54dddf095c matroskadec: add support for bzlib compressed tracks
Originally committed as revision 13177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-15 23:12:41 +00:00
Baptiste Coudurier
3f60afad28 try to demux even if codec is not recognized, should demux M1F1-float32C-AFsp.aif and fix #454
Originally committed as revision 13171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-15 22:47:40 +00:00
Baptiste Coudurier
0a1bd250d1 do not fail if correct is not recognized
Originally committed as revision 13170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-15 22:37:31 +00:00
Baptiste Coudurier
24c1d3b54d cosmetics, remove space before opening parenthesis
Originally committed as revision 13169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-15 22:14:29 +00:00
Aurelien Jacobs
2f79b4e8af add missing \n in av_log message
Originally committed as revision 13152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 23:33:15 +00:00
Aurelien Jacobs
fbb878ce0f matroskadec: add support for zlib compressed tracks
Originally committed as revision 13151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 23:32:13 +00:00
François Revol
7cf6af27c9 Fix non-debug build.
Originally committed as revision 13149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 17:43:18 +00:00
Carl Eugen Hoyos
696c30688b Fix icc warning #188: enumerated type mixed with another type
Originally committed as revision 13144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 15:51:37 +00:00
Carl Eugen Hoyos
e3227b3f25 Add MATROSKA_TRACK_TYPE_NONE.
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-13 15:42:27 +00:00
Carl Eugen Hoyos
d9133126d3 Replace some occurrences of 0 with CODEC_ID_NONE.
Fixes icc warning #188: enumerated type mixed with another type

Originally committed as revision 13135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-12 10:30:40 +00:00
Diego Pettenò
3375a6a597 Use strcasecmp() instead of re-inventing it.
Patch by Diego 'Flameeyes' Pettenò flameeyesATgmailPOINTcom

Originally committed as revision 13132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-12 01:17:00 +00:00
Luca Abeni
397db8ac5e Fix type of dest_addr_len to respect return value of udp_set_url.
Patch by Luca Abeni.

Originally committed as revision 13114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 10:53:21 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Jai Menon
86b2d47fc0 IFF stereo support
Patch by Jai Menon ( realityman gmx net )

Originally committed as revision 13097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:25:27 +00:00
Diego Biurrun
f38c6c6cab string.h is a system header file, so use <> for it.
Originally committed as revision 13091 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 09:30:43 +00:00
Aurelien Jacobs
b9a7da77ec use enum type instead of int
Originally committed as revision 13089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 01:59:33 +00:00
Aurelien Jacobs
db26212676 cosmetics: indentation
Originally committed as revision 13088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 01:54:35 +00:00
Aurelien Jacobs
de3230fb96 matroskadec: add support for lzo compressed tracks
Originally committed as revision 13087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 01:53:59 +00:00
Aurelien Jacobs
5d2b12f6de matroskadec: fail gracefully when seeking don't work
Originally committed as revision 13085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 23:11:13 +00:00
Aurelien Jacobs
53a1e82bd2 matroskadec: add support for track content encoding
Only the header strip method is supported for now.

Originally committed as revision 13082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-08 21:47:31 +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
Michael Niedermayer
abbae514e1 Check url_seek() in url_open().
Originally committed as revision 13061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-05 09:17:56 +00:00
Diego Biurrun
4b13335d1c Use correct length modifier for pointer diff argument in av_log() call.
Originally committed as revision 13057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-04 10:35:13 +00:00
Diego Pettenò
d6f142a1f8 Fix 'comparison always false' warning.
patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com

Originally committed as revision 13056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-04 10:29:12 +00:00
Benjamin Larsson
fde8052e4e dts probe
Originally committed as revision 13040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 00:12:32 +00:00
Bartlomiej Wolowiec
b7d1cd02e3 Nellymoser handling in FLV
Originally committed as revision 13032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-02 19:35:31 +00:00
Luca Barbato
17ac9f1c38 Import Dirac demuxer/muxer from SoC branch; written by Marco Gerards,
patch extracted by Anuradha Suraparaju anuradhaAtrdDoTbbcDoTcoDoTuk.

Originally committed as revision 13031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-02 14:52:39 +00:00
Justin Ruggles
8a0684f4c4 fix encoding of flac private data
Originally committed as revision 13030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-01 22:04:17 +00:00
Michael Niedermayer
b22d0c04d7 Support invalid mpeg created by vdr
(http://www.lucke.in-berlin.de/test_streams/last_played_fine_with_r7852_001.vdr).
fixes issue434

Originally committed as revision 13014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-29 00:12:49 +00:00
Michael Niedermayer
60711e9599 raw GSM demuxer (does not work yet as parser is missing)
Originally committed as revision 13013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-28 18:29:42 +00:00
Baptiste Coudurier
a0af2fa445 set demuxers .value and use common audio_read_header function
Originally committed as revision 13012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-28 14:14:44 +00:00
Henrik Gulbrandsen
e8430214c3 set pkt duration, only when dts == pts though,
patch by Henrik Gulbrandsen henrik at gulbra dot net

Originally committed as revision 13003 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 17:51:02 +00:00
Kostya Shishkov
c5497b22b7 Missing tags in APE is normal situation, so don't print an error.
Resolves issue 437

Originally committed as revision 12977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 06:29:56 +00:00
Baptiste Coudurier
eb034aca18 yes it is true for mp4
Originally committed as revision 12972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 16:52:30 +00:00
Baptiste Coudurier
43612ffe25 remove unneeded variable
Originally committed as revision 12971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 16:50:06 +00:00
Baptiste Coudurier
baf9fb32c0 move vars decls where vars are used
Originally committed as revision 12970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 16:47:22 +00:00
Baptiste Coudurier
45a97d3018 set channels and sample rate from mpeg4audio config
Originally committed as revision 12964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 14:09:42 +00:00
Baptiste Coudurier
1dec399449 parse mpeg4audio config to correctly detect mp3on4, fix iso mp3on4 reference files
Originally committed as revision 12961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 14:03:28 +00:00
Baptiste Coudurier
69b1c62756 update doc
Originally committed as revision 12960 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:56:08 +00:00
Baptiste Coudurier
7e6273322c error is -1
Originally committed as revision 12959 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:54:33 +00:00
Baptiste Coudurier
cfb5a2abcb cosmetics
Originally committed as revision 12958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:45:46 +00:00
Baptiste Coudurier
47e1d7efce move vars decls where vars are used
Originally committed as revision 12957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:44:34 +00:00
Baptiste Coudurier
8cd92bb915 parser should not be needed anymore, merge cases and set frame size for amr too
Originally committed as revision 12956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:34:51 +00:00
Baptiste Coudurier
3b8c000d1e lower frame size to split amr/qcelp/gsm frames
Originally committed as revision 12954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 13:24:25 +00:00
Baptiste Coudurier
37ffe34bf3 align and remove useless braces
Originally committed as revision 12952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 12:02:01 +00:00
Baptiste Coudurier
1c126b4f38 cosmetics, remove whitespaces in tags
Originally committed as revision 12951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 11:57:39 +00:00
Baptiste Coudurier
cc326d2bf3 set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov
Originally committed as revision 12950 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 10:35:06 +00:00
Baptiste Coudurier
07a47ae2a3 pts are unsigned according to specs, fix negative pts when 32bit pts are used
Originally committed as revision 12949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 09:08:13 +00:00
Baptiste Coudurier
254629b1aa set wrap bits to 32bit to actually use it
Originally committed as revision 12948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-25 09:04:38 +00:00
Michael Niedermayer
903a2e8628 Avoid using reserved __names.
Originally committed as revision 12946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 23:21:58 +00:00
Michael Niedermayer
ceedda75ea minor memleak
Originally committed as revision 12945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 23:09:28 +00:00
Michael Niedermayer
81d5ae6dec Fixing memleaks.
Originally committed as revision 12943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 22:16:00 +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
3f78a3a955 demux qcelp, so this can work with soc decoder and stream copy
Originally committed as revision 12941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:17:41 +00:00
Baptiste Coudurier
76f34857ce qcelp fourcc
Originally committed as revision 12940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 17:16:13 +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
be51192502 set alac frame size from extradata
Originally committed as revision 12937 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-24 13:58:22 +00:00
Michael Niedermayer
5fd63f3c3b Ensure that the timestamp reading code used for seeking chooses a position
which is a multiple of the packet size from the last packet start instead
of the file start. This fixes some seek issues with randomly cut ts files
and the mysterious "4 byte PCR somehing MTS something bug".

Originally committed as revision 12932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-23 21:16:25 +00:00
Rafaël Carré
b4bbcd635f Read asf file header fields in the right order
Patch by Rafaël Carré ( funman videolan org )

Originally committed as revision 12926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 20:08:39 +00:00
Bartlomiej Wolowiec
55736cfbd2 change ff_ac3_parse_header() to take a GetBitContext instead of const char*
Originally committed as revision 12922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 11:14:01 +00:00
Andreas Öman
c675ef7025 Compute AC3 frame CRC for stronger raw AC3 format probing.
Closes issue64.

Originally committed as revision 12920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-21 15:20:53 +00:00
Henrik Gulbrandsen
4fa6eac5f1 Correct ASF duration.
Patch by Henrik Gulbrandsen: henrik gulbra net

Originally committed as revision 12916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-21 08:19:16 +00:00
Benjamin Larsson
63d864434d Raw dts muxer
Originally committed as revision 12912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-20 20:28:12 +00:00
Vladimir Voroshilov
159ef4b02a Implement FFMAX3(a,b,c) - maximum over three arguments.
Originally committed as revision 12910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 17:07:58 +00:00
Vladimir Voroshilov
c6cd525aa0 Decrease returning probe score for WAV demuxer to avoid
probe conflict between WAV and future ACT demuxer.
This is necessary because ACT has standard WAV header
at top of it's own.

Originally committed as revision 12909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-19 14:52:19 +00:00
Mike Melanson
9e2ffc450b Tighten up the Westwood AUD detection. Probability of random detections
used to be on the order of 2^8. It is now on the order of 2^45.

Originally committed as revision 12892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-18 17:29:58 +00:00
Luca Barbato
3adfb3772c doxy header for udp protocol
Originally committed as revision 12861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 16:52:35 +00:00
Diego Biurrun
d965c3e7bc Print duration with higher precision.
patch from Hervé Flores, herve.flores free fr

Originally committed as revision 12847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 06:46:54 +00:00
Luca Barbato
b4999290fd Cleanup comments and make them doxygen parsable.
Originally committed as revision 12841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 22:22:49 +00:00
Luca Barbato
fc9b22dd2e Expose max_packet_size from the rtp protocol
Originally committed as revision 12839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 19:27:39 +00:00
Michael Niedermayer
4b3cca3630 Do not detect a format if another has the same score.
Originally committed as revision 12837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 13:50:02 +00:00
Michael Niedermayer
056f6b8f09 Using the same probe function in 2 formats is not a good idea.
Originally committed as revision 12836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 13:48:46 +00:00
Michael Niedermayer
a8f0c9c5b9 Reduce probe score as it misdetects our flv file from the regression test.
The only reason why it does not break them is that flv has the same score
and happens to be first in the list.

Originally committed as revision 12834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 13:36:31 +00:00
Michael Niedermayer
7344dac4ad Fix probe for mov00003.mqv.
Originally committed as revision 12833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 12:25:03 +00:00
Michael Niedermayer
0c73985444 Identify codec in GMCMidiaASX.mov correctly.
Originally committed as revision 12832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 11:50:37 +00:00
Luca Abeni
d2bf42bef9 Fix receiving from SDP with unicast destinations
Originally committed as revision 12831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 11:28:04 +00:00
Luca Abeni
35b74c3deb Remove the "multicast=" tag from UDP and RTP URLs
Originally committed as revision 12830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-15 11:23:07 +00:00
Robert Marston
861c63a216 Maxis XA demuxer and decoder.
Patch by Robert Marston rmarston (\at/) gmail point com
Original thread: [FFmpeg-soc] [Patch] Maxis EA XA decoder - GSoC Task
Date: 04/08/2008 01:36 AM

Originally committed as revision 12817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 14:31:43 +00:00
Michael Niedermayer
780169c363 Remove useless code.
Originally committed as revision 12814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:25:44 +00:00
Michael Niedermayer
b41497e903 Recommit r12809
Log:
	10l
	Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
	fixes WELCOMETOBELGRADE.flv
After seeking bug has been fixed.

Originally committed as revision 12813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:24:29 +00:00
Michael Niedermayer
0366654e2b Use generic seeking code for flv. The removed code was a buggy duplicate.
Originally committed as revision 12812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:22:23 +00:00
Michael Niedermayer
26d95a1ecf revert r12809
Log:
	10l
	Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
	fixes WELCOMETOBELGRADE.flv
As it unexpectly breaks seek regression tests.

Originally committed as revision 12811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-14 12:10:53 +00:00
Michael Niedermayer
a33cfa3071 Stop find_stream_info() searching for further streams if 2 streams have
been found.

Originally committed as revision 12810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 23:47:03 +00:00
Michael Niedermayer
749c9201aa 10l
Setting AVFMTCTX_NOHEADER if streams<2 so phantom streams are found.
fixes WELCOMETOBELGRADE.flv

Originally committed as revision 12809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 22:58:04 +00:00
Sisir Koppaka
b64c096be9 BFI demuxer
Patch by Sisir Koppaka (sisir.koppaka at G.M!A.I!L.com)

Originally committed as revision 12808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 21:06:31 +00:00
Michael Niedermayer
7ce76ee433 Print warning if scale/rate is invalid.
Originally committed as revision 12806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:45:18 +00:00
Michael Niedermayer
0dbb651564 indent
Originally committed as revision 12805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:41:45 +00:00
Michael Niedermayer
4a030a1fc7 Restructure if/else a little.
Originally committed as revision 12804 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 11:41:09 +00:00
Reimar Döffinger
ee794d1e49 Do not call update_initial_durations if pkt->duration is 0.
Fixes and assertion crash when playing amv files, e.g.
http://samples.mplayerhq.hu/amv/Shakira - Hips Don't Lie.amv

Originally committed as revision 12797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-13 08:55:02 +00:00
Michael Niedermayer
fd31550d23 Fix seeking in rm.
Originally committed as revision 12779 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-09 23:19:05 +00:00
Måns Rullgård
71c61f62a3 non-recursive makefiles
Originally committed as revision 12760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-07 21:16:31 +00:00
Baptiste Coudurier
0265fe81e4 remove cast
Originally committed as revision 12757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-05 12:47:56 +00:00
Baptiste Coudurier
612b5cbb24 better error message
Originally committed as revision 12756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-05 12:46:59 +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
Luca Barbato
5ee0e1395d use FF_NETERROR to make winsock happy, patch from prossATxvidDoTorg
Originally committed as revision 12678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-03 22:15:16 +00:00
Aurelien Jacobs
7bfacd4e75 use common aac sample rate tables
Originally committed as revision 12671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-02 21:41:48 +00:00
Diego Biurrun
b2fec0fc25 Remove unused variable.
Originally committed as revision 12670 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-02 19:03:59 +00:00
Aurelien Jacobs
2d1cb02588 check return value of matroska_find_track_by_num (fix a segfault)
Originally committed as revision 12659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 20:16:04 +00:00
Diego Biurrun
4477dedc4f minor typo fixes
Originally committed as revision 12658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 17:31:11 +00:00
Eli Friedman
4fd51ee39a ARMovie/RPL demuxer
Patch by Eli Friedman (eli friedman gmail com)

Originally committed as revision 12649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 10:44:33 +00:00
Luca Abeni
2ccf0a4290 Add a comment about missing entries
Originally committed as revision 12646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:54:49 +00:00
Luca Abeni
87cb064359 Use the correct size for the enc_name field (removing the arbitrary "50" size)
Originally committed as revision 12645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:49:58 +00:00
Luca Abeni
19faa9f469 Remove useless entries from AVRtpPayloadTypes
Originally committed as revision 12644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:48:04 +00:00
Luca Abeni
e4ed1fbf91 Support mp3 audio in the RTP muxer
Originally committed as revision 12643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-31 09:42:45 +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
5e788d588b support mp4 fragmented files without any samples in the moov atom
Originally committed as revision 12635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 21:15:06 +00:00
Baptiste Coudurier
44e43aab03 check frag track id before setting st
Originally committed as revision 12634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 20:49:29 +00:00
Jai Menon
3a027f5e66 IFF demuxer
Patch by Jai Menon (realityman <at> gmx.net)

Originally committed as revision 12633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 19:17:01 +00:00
Justin Ruggles
6e330816d4 fix Ogg/FLAC header size
Originally committed as revision 12626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-30 03:40:03 +00:00
Baptiste Coudurier
5610f20ed4 gsm in mov, demux surge-1-16-B-agsm.mov
Originally committed as revision 12621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 16:30:22 +00:00
Diego Biurrun
c023bfe993 cosmetics: alphabetical order
Originally committed as revision 12619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 10:40:19 +00:00
Michael Niedermayer
1ce50d32b7 indent
Originally committed as revision 12618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 03:50:40 +00:00
Michael Niedermayer
79d6b9cbd0 1000l to myself, dereferencing uninitalized pointer.
Originally committed as revision 12614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 02:44:44 +00:00
Michael Niedermayer
41757171e7 Support wb00+dc00 chunk mix.
fixes issue402

Originally committed as revision 12609 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 20:58:01 +00:00
Baptiste Coudurier
9e81a0ce00 print essence path in error message
Originally committed as revision 12607 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:30:31 +00:00
Baptiste Coudurier
9ce84dd8b4 cosmetics, useless braces
Originally committed as revision 12606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:20:12 +00:00
Baptiste Coudurier
6282c5f45b print stream index in error message
Originally committed as revision 12605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:19:19 +00:00
Baptiste Coudurier
71f3623510 according to specs, only color table id set to 0, have it in stsd, fix 4colors.mov
Originally committed as revision 12604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 13:16:29 +00:00
Baptiste Coudurier
d3bc61ac75 Only use chunk demuxing for old uncompressed audio mechanism specified by stts.
This will split amr/aac cbr samples correctly in isom files which do not
set audio cid to -2.

Originally committed as revision 12603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 12:35:22 +00:00
Michael Niedermayer
61559562f5 Fix aspect ratio.
fixes issue404
avienc.c change by StevieS

Originally committed as revision 12601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-27 01:18:16 +00:00
Michael Niedermayer
57ecf8d281 1st attempt at correcting the punktuation.
Originally committed as revision 12555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-22 17:25:50 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-22 01:06:57 +00:00
Michael Niedermayer
4edfceccec Document get_*_buffer()
Originally committed as revision 12548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 22:17:56 +00:00
Baptiste Coudurier
48a5529016 sample size to 1 might happen for data, fix GMCMidiaASX.mov, fallback is better than failing
Originally committed as revision 12547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 14:30:45 +00:00
Sascha Sommer
cb96da4902 rl2 demuxer
Originally committed as revision 12545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 14:02:13 +00:00
Baptiste Coudurier
084d8faa21 yet again another hdv fourcc
Originally committed as revision 12544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:47:20 +00:00
Baptiste Coudurier
433aeb6240 support fragments when non streamable
Originally committed as revision 12542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:43:19 +00:00
Baptiste Coudurier
61aedb0f56 mp4 fragments support
Originally committed as revision 12541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 13:40:23 +00:00
Michael Niedermayer
67e2102042 Document a few url_* functions.
Originally committed as revision 12537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:27:07 +00:00
Baptiste Coudurier
117a9190cd cosmetics, split or move too long lines
Originally committed as revision 12536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:16:16 +00:00
Baptiste Coudurier
db3ee6cc96 simplify, and only stop parsing when non streamable
Originally committed as revision 12534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:04:54 +00:00
Baptiste Coudurier
19d02551d7 remove ms audio tags from table, they will be chosen or detected with riff table
Originally committed as revision 12533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 11:02:13 +00:00
Baptiste Coudurier
bb787a93dd atoms are not mp4 only, and yes probe is sufficient
Originally committed as revision 12532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:52:14 +00:00
Baptiste Coudurier
9c55b7725b update description
Originally committed as revision 12531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:51:12 +00:00
Baptiste Coudurier
3efe8848fc return ENOMEM
Originally committed as revision 12530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:48:22 +00:00
Baptiste Coudurier
2922cbdb14 cannot free AVStream like this, and return ENOMEM
Originally committed as revision 12529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:47:14 +00:00
Baptiste Coudurier
e3c4740fd4 indentation
Originally committed as revision 12528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 10:39:49 +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
Michael Niedermayer
b7c407449b One non functional AVPalette chunk less, one heap overflow less.
Fixes playback of CIMOVI01.avi.

Originally committed as revision 12517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:29:18 +00:00
Baptiste Coudurier
eb61405a07 remove useless debug print since now mov_build_index will do
Originally committed as revision 12516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:07:55 +00:00
Baptiste Coudurier
f9900374ec free track data asap
Originally committed as revision 12515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 16:00:45 +00:00
Baptiste Coudurier
1e77810d3b move mov_build_index before mov_read_trak to avoid useless declaration
Originally committed as revision 12514 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:57:11 +00:00
Baptiste Coudurier
bd991df2a7 move specific end treatment when trak is detected, will be needed for fragments
Originally committed as revision 12513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 15:55:50 +00:00
Pascal Massimino
c04c52d3a8 Additional checks for strange num_val in FLV metadata
Avoids some "Unsupported audio codec (6)" message in FLVs, e.g.
        Example of such problematic bitstream is 'bad_codec6.flv'
        in ftp's /incoming directory.

Originally committed as revision 12510 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 11:02:40 +00:00
Ronald S. Bultje
7e6ca34f27 Reindent after rtsp-alternate-protocol* patches.
Originally committed as revision 12506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:08:16 +00:00
Ronald S. Bultje
8792f52a9b Change protocol_mask into protocol, since we always just try a single one per
iteration in make_setup_request(), and cycling between the different protocols
is now done in the calling function, therefore the need for a mask goes away.
This also makes the function somewhat simpler to read.

Discussed and approved in "[PATCH] RTSP alternate protocol 3/4".

Originally committed as revision 12505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:07:31 +00:00
Ronald S. Bultje
8a8754d80f Allow cycling between different protocols (TCP, UDP or multicast) so that if
one doesn't work, we can try the next one (i.e. trial-error protocol auto-
probing).

Discussed and approved in "[PATCH] RTSP alternate protocol 2-3/3".

Originally committed as revision 12504 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-19 14:05:08 +00:00
Ramiro Polla
0f3444e17c MSN TCP Webcam stream demuxer.
Originally committed as revision 12492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-18 19:54:47 +00:00
Ronald S. Bultje
53620bba51 Split the SETUP request into a separate function, as a prelude into allowing
multiple SETUPs to be send to cycle protocols rather than bailing if one
fails.

Discussed and approved in "[PATCH] RTSP alternate protocol 1/3".

Originally committed as revision 12476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-17 12:16:39 +00:00
Baptiste Coudurier
8c2a207019 just skip klv packet, when no corresponding stream is found
Originally committed as revision 12464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 17:54:36 +00:00
Baptiste Coudurier
23f0861715 simplify, flags is 24bits according to specs
Originally committed as revision 12460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 15:13:40 +00:00
Baptiste Coudurier
558ce5c490 fucked up alphabetical order again, sorry
Originally committed as revision 12459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-16 13:40:21 +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
Diego Biurrun
bd10713636 typo fixes
Originally committed as revision 12449 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-15 16:15:47 +00:00
Baptiste Coudurier
4e9b8211b0 useless null
Originally committed as revision 12441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 13:10:49 +00:00
Baptiste Coudurier
82213f68ba remove useless img_write_trailer func
Originally committed as revision 12440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-14 12:48:13 +00:00
Diego Biurrun
2cab640129 typo fixes
Originally committed as revision 12428 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-12 23:58:46 +00:00
Aurelien Jacobs
074ac3c2d0 add out of bound stream index checks
fix issue379

Originally committed as revision 12417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 21:23:06 +00:00
Aurelien Jacobs
6ed4eec550 add a temporary variable to simplify the code
Originally committed as revision 12415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 21:09:27 +00:00
Björn Axelsson
5acef35f57 Add AVClass to URLContext at next major version bump
Patch by Björn Axelsson (bjorn axelsson intinor se)

Originally committed as revision 12411 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 19:03:39 +00:00
Diego Biurrun
7ce6892373 misc spelling fixes
Originally committed as revision 12410 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 18:42:09 +00:00
Aurelien Jacobs
b847847a0c cosmetics: remove some empty lines
Originally committed as revision 12404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 00:48:36 +00:00
Aurelien Jacobs
01ccf45b92 remove useless and misleading comments
Originally committed as revision 12403 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 00:45:25 +00:00
Aurelien Jacobs
36b0782e71 consistent use of MKTAG() in the codec_bmp_tags table
Originally committed as revision 12401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:43:55 +00:00
Aurelien Jacobs
ab0b2e559a cosmetics: alignment of the codec_bmp_tags table
Originally committed as revision 12400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:34:14 +00:00
Mike Melanson
d98878f423 recognize the CLJR FourCC (Cirrus Logic AccuPak)
Originally committed as revision 12391 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 04:18:48 +00:00
Ramiro Polla
ffa71b2bbb Typo + grammar
Originally committed as revision 12385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 22:43:13 +00:00
Ramiro Polla
ab8ab30c3d Introduce max_picture_buffer variable in AVFormatContext,
set by rtbufsize option.

Originally committed as revision 12383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 21:59:11 +00:00
Ramiro Polla
54b6249681 Define WIN32_LEAN_AND_MEAN before including windows.h to exclude
rarely-used header files.

Originally committed as revision 12378 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 19:00:55 +00:00
Ramiro Polla
a06ba2a18d Include windows.h instead of trying to redeclare Sleep
os_support.h used to be included in all lavf files, and including windows.h
here caused a significant slowdown.

Originally committed as revision 12377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 18:59:45 +00:00
Ramiro Polla
409e1d71ea Put network-related code under #ifdef
Originally committed as revision 12372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 17:43:53 +00:00
Ramiro Polla
591cf1170b Group network-related code together
Originally committed as revision 12371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 17:43:10 +00:00
Diego Biurrun
9b25f4a65f cosmetics: Consistently move NAME and FFLIBS to the top of each Makefile.
Originally committed as revision 12364 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-08 14:39:43 +00:00
Ramiro Polla
5dea940937 __stdcall -> WINAPI
Windows x64 has no __stdcall.
It is not yet supported, but someday it might...

Originally committed as revision 12363 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:47:44 +00:00
Måns Rullgård
0e32c8c65a simplify library version handling
Originally committed as revision 12362 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:27:17 +00:00
Evgeniy Stepanov
90c2295b24 Add 'disposition' bitfield to AVStream and use it for both muxing and demuxing
of matroska and nut.

Originally committed as revision 12358 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-07 19:25:09 +00:00
Måns Rullgård
5671fc14f6 consolidate CFLAGS, LDFLAGS, EXTRALIBS assignment
Originally committed as revision 12354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 20:44:44 +00:00
Baptiste Coudurier
4c7981ba7c do not reset duration_error for all streams, only reset current stream, fix wrong_fps.gxf
Originally committed as revision 12353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 17:44:42 +00:00
Baptiste Coudurier
72d334cab4 support AVDISCARD_ALL
Originally committed as revision 12350 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 13:40:29 +00:00
Michael Niedermayer
11c55efa34 Skip over unknown extended_content_header tags.
fixes issue358

Originally committed as revision 12347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:26:48 +00:00
Michael Niedermayer
16428e6348 simplify
Originally committed as revision 12346 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-06 00:20:49 +00:00
Diego Biurrun
d78d72da66 Set TCP protocol to is_streamed=1 as seeking is not possible.
Björn Axelsson, bjorn.axelsson intinor se

Originally committed as revision 12338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 15:29:10 +00:00
Luca Abeni
83cc23c5d3 Add some information about the stream bitrate, if available
Originally committed as revision 12331 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 13:31:24 +00:00
Michael Niedermayer
1326621c1a Subtitle support. (untested)
Originally committed as revision 12330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 13:06:49 +00:00
Baptiste Coudurier
112249de00 set block align for mace3/6
Originally committed as revision 12328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 12:06:57 +00:00
Baptiste Coudurier
28da7981d0 correctly compute bit rate for compressed audio, should fix seeking in aiff
Originally committed as revision 12327 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-05 12:02:32 +00:00
Michael Niedermayer
675b8390f6 Ignore flags after pts/dts if there are no bytes left.
Fixes decoding of vdr-radio.vdr. (issue198)

Originally committed as revision 12310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-04 01:31:15 +00:00
Aurelien Jacobs
6e196eacc3 include required headers for int64_t and AV_RB16()
Originally committed as revision 12306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 23:00:48 +00:00
Aurelien Jacobs
abf2dc9c9a avi.h does not use anything from avcodec.h.
Originally committed as revision 12305 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 22:56:07 +00:00
Reimar Döffinger
e7a5e2f626 Fix decoding of interlaced gif, e.g. http://samples.mplayerhq.hu/GIF/7up.gif
Originally committed as revision 12297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 13:16:29 +00:00
Michael Niedermayer
78db672cae Use block_align as the avi spec says.
fix issue274

Originally committed as revision 12296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 01:27:15 +00:00
Michael Niedermayer
143b082044 Print slightly more useful info.
Originally committed as revision 12295 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-03 01:23:18 +00:00
Michael Niedermayer
a7805e2983 Fallback to sample rate if bit rate is 0. This avoids 0 timebases in nut.
Originally committed as revision 12294 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 23:47:30 +00:00
Michael Niedermayer
9fdfd21c77 factorize
Originally committed as revision 12293 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 23:13:07 +00:00
Michael Niedermayer
a048febdc4 subtitles (codec tag tables still missing ...)
Originally committed as revision 12292 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 23:11:36 +00:00
Michael Niedermayer
5b08754912 Store aspect ratio in avis.
Originally committed as revision 12290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-02 19:51:31 +00:00
Mike Melanson
74e21d0352 fix wc3movie demuxer to conform to the PTS API
Originally committed as revision 12283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 02:28:47 +00:00
Mike Melanson
40e8e49700 fix the id CIN demuxer by using the pts API correctly
Originally committed as revision 12281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 01:43:19 +00:00
Aurelien Jacobs
73260a11e1 simplification proposed by Rich
Originally committed as revision 12280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 00:26:19 +00:00
Michael Niedermayer
2401daaf39 add cdvc
(from a patch by Dmitry Vassiliev // slydiman mail ru)

Originally committed as revision 12279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-29 11:41:57 +00:00
Baptiste Coudurier
0de2157fa4 set codec bps to grayscale bits, fix 256grey.mov
Originally committed as revision 12272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-28 16:05:19 +00:00
Benjamin Larsson
800b9c24b7 Add more riff IDs to support remuxing.
Originally committed as revision 12266 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 20:34:44 +00:00
Baptiste Coudurier
da00a1bdf4 add weird first atom to probe, finally fix bartjones.mov
Originally committed as revision 12265 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 12:24:27 +00:00
Baptiste Coudurier
dbb3765779 free in case of multiple type == 2
Originally committed as revision 12263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:31:41 +00:00
Baptiste Coudurier
2f4568e525 return error if malloc fails
Originally committed as revision 12262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:56 +00:00
Baptiste Coudurier
dbb7cbf26e fix possible overflow with memmove
Originally committed as revision 12261 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 09:30:05 +00:00
Aurelien Jacobs
0b247953c8 makes really sure that no undefined behavior can happen
Originally committed as revision 12258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-27 00:53:34 +00:00
Aurelien Jacobs
d597655f77 Avoid infinite loop.
uint64_t >> 64 is an undefined operation

Originally committed as revision 12253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 22:35:07 +00:00
Måns Rullgård
800c289a66 less preprocessor magic in version number macros
Originally committed as revision 12246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 20:37:59 +00:00
Baptiste Coudurier
26846ba515 support keyframes indexes starting at 0, broken files created by omneon, fix ref.mov seeking
Originally committed as revision 12242 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:27:21 +00:00
Baptiste Coudurier
221e21b70d support mov reference files, ref.mov/ref.m2v/ref.wav and detect BrianCox.mov
Originally committed as revision 12241 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 18:21:58 +00:00
Baptiste Coudurier
60f5c96ee6 remove useless braces
Originally committed as revision 12232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:42:07 +00:00
Baptiste Coudurier
18978a4918 indentation
Originally committed as revision 12231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:41:40 +00:00
Baptiste Coudurier
6d680e1b50 rescale frame size, fix i.3g2
Originally committed as revision 12230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:36:49 +00:00
Baptiste Coudurier
f296563e5f move parameters reset after setting stream parameters, will need those infos
Originally committed as revision 12229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 14:31:36 +00:00
Loren Merritt
042e0adda9 decode mng color decorrelation
Originally committed as revision 12228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-26 10:21:33 +00:00
Baptiste Coudurier
4649fa9052 fix mace duration
Originally committed as revision 12209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:59:42 +00:00
Baptiste Coudurier
852859ff7c protect malloc overflow
Originally committed as revision 12208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:45:59 +00:00
Baptiste Coudurier
17871a02ad indentation
Originally committed as revision 12207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:44:15 +00:00
Baptiste Coudurier
b014dd7695 fail if extradata cannot be allocated
Originally committed as revision 12206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:42:32 +00:00
Baptiste Coudurier
9c7fd997f7 10l, protect malloc overflow
Originally committed as revision 12205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:38:37 +00:00
Baptiste Coudurier
b8d3daca62 support QDM2 in aiff, QDM2.aif
Originally committed as revision 12204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:29:34 +00:00
Baptiste Coudurier
4c638f0c7c remove useless close function
Originally committed as revision 12203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:24:30 +00:00
Baptiste Coudurier
54d8fd20fd indentation
Originally committed as revision 12202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:23:27 +00:00
Baptiste Coudurier
c6f5381215 remove useless casts
Originally committed as revision 12201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:15:26 +00:00
Baptiste Coudurier
9df21f24e1 cosmetics
Originally committed as revision 12200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:14:15 +00:00
Baptiste Coudurier
b4dc27a829 remove useless tags, codec_get_id matches independently and qt uses lower case tags
Originally committed as revision 12199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:08:26 +00:00
Baptiste Coudurier
e13c078333 set bps to uncompressed original sound data for compressed audio
according to aiff specs, qt set it to 16 for mace and ima4,
fail if block align is not set.

Originally committed as revision 12198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 12:00:31 +00:00
Baptiste Coudurier
e013015980 fix duration for ima4
Originally committed as revision 12197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 11:34:26 +00:00
Baptiste Coudurier
3a957df49e ima4 in aiff support
Originally committed as revision 12196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 10:57:22 +00:00
Måns Rullgård
76a448ed4f Install headers in $prefix/include/$libname
Install each library's headers in $prefix/include/$libname.
The installed headers use #include "lib*/*.h"; applications
are expected to do the same.

Specify only $prefix/include in .pc files.

Originally committed as revision 12194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-25 09:22:11 +00:00
Diego Biurrun
8af9090f4f cosmetics: Sort and prettyprint codec_wav_tags[].
Originally committed as revision 12192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 23:02:47 +00:00
Michael Niedermayer
ac6f133027 Set indexmem to a saner default.
Originally committed as revision 12190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 16:28:35 +00:00
Michael Niedermayer
58293e57e1 Fix issue357
Do what the spec says, insane or not:
"
Format 0 (uncompressed) and Format 3 (uncompressed little-endian) are similar. Both encode
uncompressed audio samples. For 8-bit samples, the two formats are identical. For 16-bit
samples, the two formats differ in byte ordering. In Format 0, 16-bit samples are encoded and
decoded according to the native byte ordering of the platform on which the encoder and Flash
Player, respectively, are running. In Format 3, 16-bit samples are always encoded in little-endian
order (least significant byte first), and are byte-swapped if necessary in Flash Player before
playback. Format 0 is clearly disadvantageous because it introduces a playback platform
dependency. For 16-bit samples, Format 3 is highly preferable to Format 0 for SWF version 4
or later.
"

Originally committed as revision 12184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 01:04:00 +00:00
Michael Niedermayer
44de39f93c flv/swf do not have a big endian codec id, they only support
little endian and native endian.

Originally committed as revision 12183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-24 00:57:15 +00:00
Benjamin Larsson
7bb8d51c1f Riff ids for wmapro and wmavoice, this adds support for stream copy of these codecs between asf,avi and wav containers.
Originally committed as revision 12182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 23:30:41 +00:00
Nico Sabbi
a45b40c496 treat stream_type==0x82 as AUDIO_DTS when the program has a REGISTRATION_DESCRIPTOR with the value HDMV; approved by Mans
Originally committed as revision 12180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 10:57:38 +00:00
Michael Niedermayer
635fbcb17f revert 12156
Log:
Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.
----
A IMHO cleaner solution has been implemented.

Originally committed as revision 12162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 20:24:38 +00:00
Luca Abeni
d597e1b76c Fix computation of the "NTP time" field in RTCP SR packets, and do not
export times with microsecond precision

Originally committed as revision 12158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 10:19:35 +00:00
Michael Niedermayer
91acf9a8bc Get rid of a fake timestamp discontinuity at the begin of V.VOB.
This solution is not really correct but it is quite simple. Correct would
be to do a second pass over the packets after all the headers have been
collected.

Originally committed as revision 12157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 03:40:07 +00:00
Michael Niedermayer
ff2635b273 Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.

Originally committed as revision 12156 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-20 03:20:06 +00:00
Måns Rullgård
e97ac1e6f5 Clean up lib* version definitions
Updating version numbers now requires changing only one place.

Originally committed as revision 12154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:50:28 +00:00
Michael Niedermayer
cea9642014 Fix ;;
Originally committed as revision 12153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:09:08 +00:00
Reimar Döffinger
a56dcc5793 Add some const, fixes warnings:
rtpenc_h264.c:69: warning: assignment discards qualifiers from pointer target type
rtpenc_h264.c:74: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 12152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 22:07:48 +00:00
Reimar Döffinger
a1fc4d4aa8 Missing const, fix warnings:
sdp.c:115: warning: assignment discards qualifiers from pointer target type
sdp.c:120: warning: assignment discards qualifiers from pointer target type

Originally committed as revision 12151 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 21:58:54 +00:00
Reimar Döffinger
591de5cf35 Fix misplaced const, avoids a cast-discards-qualifiers warning
Originally committed as revision 12146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 16:18:17 +00:00
Michael Niedermayer
d937cd0ed2 const
Originally committed as revision 12145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-19 16:08:52 +00:00
Michael Niedermayer
83a9db42a3 Fix timestamps and durations if the first packets have no durations nor timestamps,
and the information needed to guess the duration only becomes known at a later packet.

Originally committed as revision 11963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 20:32:32 +00:00
Michael Niedermayer
e942293db1 It appears last_pts was not set ...
Originally committed as revision 11939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 13:21:00 +00:00
Michael Niedermayer
a712d725c0 Header elision muxing support.
This only removes 2 bytes from MP3 and MP2 currently.
Up to 4 could be removed from MP3/MP2 though this might need a 2pass muxer.
Primitive code to remove headers from MPEG-1/2/4 is there too but for the
single file I tried it on (the one in the regression tests), it was a loss
because all video frames were >4096 byte, so that it is disabled ATM.

Originally committed as revision 11936 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 02:57:19 +00:00
Michael Niedermayer
3b4f69ae8c Elision header demuxing support.
Originally committed as revision 11935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-15 02:36:09 +00:00
Michael Niedermayer
7eeebcc5de Read match time delta in the frame header.
We do not do anything with it as lavf does not really support it yet.

Originally committed as revision 11931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 20:17:28 +00:00
Michael Niedermayer
6cb4b28fea Read match_time_delta in the framecode table.
Originally committed as revision 11930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 20:13:29 +00:00
Michael Niedermayer
42abeeae3f update flags
Originally committed as revision 11929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 20:01:09 +00:00
Baptiste Coudurier
501f162fde honor stsd v1 first, fix mace surge-2-8-MAC3.mov, beware of mulaw,alaw
Originally committed as revision 11928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 19:26:45 +00:00
Baptiste Coudurier
6a1f4535f8 10l, forgot alaw/mulaw mono, use bits_per_sample in fact,
it should correctly set by av_get_bits_per_sample if recognized

Originally committed as revision 11925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 13:11:10 +00:00
Luca Abeni
f8cda19ee6 Include poll.h instead of sys/poll.h
Originally committed as revision 11924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 12:51:14 +00:00
Baptiste Coudurier
d435e520d8 warn use if edit list is not starting at 0, a/v desync might occur
Originally committed as revision 11923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:58:16 +00:00
Baptiste Coudurier
fffa99ddd0 remove now useless code
Originally committed as revision 11922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:53:48 +00:00
Baptiste Coudurier
531527652f remove messy and not always correct chunk size workaround, use correct values instead
Originally committed as revision 11921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 10:52:23 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 09:26:10 +00:00
Baptiste Coudurier
300aa2b039 return error when dv audio extraction fails
Originally committed as revision 11913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:37:44 +00:00
Baptiste Coudurier
e6920f2445 remove obsolete comments
Originally committed as revision 11912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:34:43 +00:00
Baptiste Coudurier
3a3aa49ab7 remove useless braces
Originally committed as revision 11911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:34:03 +00:00
Baptiste Coudurier
311490cccd cosmetics, indentation, braces
Originally committed as revision 11910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:33:35 +00:00
Baptiste Coudurier
8cb66fd8f2 split chunks in the case of big compressed audio frames,
might be tweaked, fix qt_dv_pal_test.mov.

Originally committed as revision 11909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:32:35 +00:00
Baptiste Coudurier
77c7543702 use correct demux mechanism when audio compression id is -2, dv audio does not matter, demux partially qt_dv_pal_test.mov which does NOT use cid -2
Originally committed as revision 11908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 22:23:05 +00:00
Baptiste Coudurier
d0cbff868e fcp imx 40 fourccs
Originally committed as revision 11906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 15:20:35 +00:00
Baptiste Coudurier
56ea717b46 indentation
Originally committed as revision 11905 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 14:10:52 +00:00
Baptiste Coudurier
4f0e712ecb more correct and simpler
Originally committed as revision 11904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 14:10:29 +00:00
D Richard Felker III
03c09e4399 Do not use GNU-specific (or BSD-specific or whatever they may be)
constants which are completely unneeded anyway. Note that 3 is a cheap
integer bound for log10(1<<CHAR_BIT).

Originally committed as revision 11902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-11 03:30:42 +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
Reimar Döffinger
cb4ddf7765 Add support for speex in ogg
Originally committed as revision 11878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 12:37:37 +00:00
Michael Niedermayer
744a9c75cf Allow the user to select which codec out of several in stsd he wants.
Originally committed as revision 11873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-06 01:51:32 +00:00
Baptiste Coudurier
37b74c8651 Fix issue 338:
Correctly interleave ogg packets per granule
and set eos correctly, 2 packets buffering is needed.
It duplicates interleave_per_dts a bit,
if someone has a good solution, I'll implement it.

Originally committed as revision 11867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-05 01:16:47 +00:00
Baptiste Coudurier
2dd3c9e0fa it seems ogg requires granule to be -1 on unfinished packets
Originally committed as revision 11866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-05 01:01:56 +00:00
Reimar Döffinger
c901197693 String pointers of ogg_codec_t should have const attribute.
Originally committed as revision 11860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 12:32:25 +00:00
Christophe Lorenz
23ef05756e Add dv50 tag to support samples with dv50 fourcc in AVI.
patch by christophelorenz  christophelorenz gmail com

Originally committed as revision 11859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 12:18:00 +00:00
Reimar Döffinger
cd41a73f89 Fix a possible use of an uninitialized pointer.
Originally committed as revision 11857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 12:13:09 +00:00
Oded Shimon
4ddcc983b4 back_ptr calculation used wrong timebase when searching for back syncpoint
Originally committed as revision 11856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:48:41 +00:00
Oded Shimon
02c986a8d6 Fix intented algo in syncpoint writing before keyframes in NUT muxer
Originally committed as revision 11855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:45:32 +00:00
Oded Shimon
82badd27f1 nut->max_distance was not set at all anywhere in the NUT muxer
Originally committed as revision 11854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:34:35 +00:00
Oded Shimon
eae213af43 Remove old workaround in nutdec.c for libnut bug
Originally committed as revision 11853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:30:38 +00:00
Oded Shimon
b19e3983cf missing " && j<syncpoint_count" protection in the index parsing, as the
spec instructs...

Originally committed as revision 11852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:29:03 +00:00
Oded Shimon
103d74ea5c ff_nut_reset_ts() expected to get 'ts*time_base_count', but muxer only
gave it 'ts'. Fixed by changing ff_nut_reset_ts() and demuxer params

Originally committed as revision 11851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 10:27:32 +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
Michael Niedermayer
37e4979a2c Remove incorrect cast found by -Wwrite-strings.
Originally committed as revision 11848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:04:27 +00:00
Michael Niedermayer
8df94c73dc Another const found by -Wwrite-strings.
Originally committed as revision 11847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 01:01:52 +00:00
Michael Niedermayer
8dd8dc5790 fix 8 "initialization discards qualifiers from pointer target type"
warnings

Originally committed as revision 11845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:42:27 +00:00
Michael Niedermayer
0fca8bc835 Fix info packet type, found by oded as well as the new pedantic const
warnings.

Originally committed as revision 11843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:33:52 +00:00
Michael Niedermayer
7ebab67901 -Wwrite-strings nitpicking fix
Originally committed as revision 11842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:31:31 +00:00
Michael Niedermayer
4cf97abb98 Missing const found by -Wwrite-strings.
Originally committed as revision 11841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-04 00:26:43 +00:00
Reimar Döffinger
7abe438045 Remove ff_mms_set_stream_selection again from asf demuxer,
it does not seem like a good solution to the problem and will
cause dependency problems if a libavprotocols should be split out.

Originally committed as revision 11827 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-03 11:18:53 +00:00
Michael Niedermayer
dc29622385 Remove incorrect casts that should have never been there.
Originally committed as revision 11824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 22:55:58 +00:00
Reimar Döffinger
2907abed17 Remove a pointless cast.
Originally committed as revision 11819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 22:03:01 +00:00
Reimar Döffinger
4d65da424a Put is_mms under ifdef CONFIG_MMSH_PROTOCOL, avoids warning:
libavformat/asf.c:112: warning: 'is_mms' defined but not used

Originally committed as revision 11815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 21:17:46 +00:00
Reimar Döffinger
b630a39ecd Missing 'const' in cast.
Originally committed as revision 11814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 20:58:58 +00:00
Diego Biurrun
5f359c8d3e cosmetics: sort ogg_codec_t list
Originally committed as revision 11810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-02 14:55:57 +00:00
Baptiste Coudurier
73965d1b96 const
Originally committed as revision 11763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:17:43 +00:00
Baptiste Coudurier
47a0513b0c const
Originally committed as revision 11762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 15:17:32 +00:00
Baptiste Coudurier
2b12d6fc79 add const
Originally committed as revision 11756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 14:58:35 +00:00
Reimar Döffinger
2331e31c23 Add support for ogg text subtitles.
Originally committed as revision 11698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 22:30:55 +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
d7742a7491 typo, typedef uint8_t GUID[16] in asf.h, and fix warning: asf-enc.c:202: warning: passing argument 2 of 'put_buffer' from incompatible pointer type
Originally committed as revision 11684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:34:22 +00:00
Baptiste Coudurier
febc8fad0c init to 0, fix warning: mpegenc.c:1022: warning: 'avail_space' may be used uninitialized in this function
Originally committed as revision 11683 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:27:51 +00:00
Baptiste Coudurier
87be0d1289 add parenthesis, fix warning: mpegenc.c:303: warning: suggest parentheses around && within ||
Originally committed as revision 11682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:25:40 +00:00
Baptiste Coudurier
3dc761a443 typo, also fix warning: asf.c:90: warning: passing argument 2 of 'get_buffer' from incompatible pointer type
Originally committed as revision 11681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-31 00:22:25 +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
Reimar Döffinger
eb3ba13b51 Support MP4 subtitles as in
http://samples.mplayerhq.hu/MPEG-4/embedded_subs/1Video_2Audio_2SUBs_timed_text_streams_.mp4

Originally committed as revision 11663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-29 22:37:07 +00:00
Kostya Shishkov
eda178d273 SMPTE 421 Annex L format demuxer
Originally committed as revision 11661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-29 09:25:49 +00:00
Baptiste Coudurier
0b98a7b3b2 cosmetics, split long lines, remove useless braces, merge comments and if
Originally committed as revision 11656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:35:12 +00:00
Baptiste Coudurier
506e4bb8bc cosmetics, vertically align
Originally committed as revision 11655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 18:33:27 +00:00
Baptiste Coudurier
bbe052463d spoke too fast, fix dv fourcc in mov accordingly if strict
Originally committed as revision 11653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:58:42 +00:00
Baptiste Coudurier
ea1664e33a finally set codec tags for mov/mp4/3gp muxers, this should not break anything, if it breaks anything, yell
Originally committed as revision 11652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 16:03:50 +00:00
Baptiste Coudurier
d97f214435 indentation
Originally committed as revision 11651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:23:37 +00:00
Baptiste Coudurier
a23c9c4a50 correctly and only set standard stsd fourcc for mp4/3gp
Originally committed as revision 11650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 15:22:07 +00:00
Baptiste Coudurier
d0c0a29b5a write esds atom when mpeg-4 systems tags are used
Originally committed as revision 11649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:44:27 +00:00
Baptiste Coudurier
efc9e44da6 reorder object types id by muxing preference
Originally committed as revision 11648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:49 +00:00
Baptiste Coudurier
2c2f58c0ad document tag field
Originally committed as revision 11647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-28 13:19:16 +00:00
Reimar Döffinger
cc8c2c6ab3 Add CODEC_ID_MOV_TEXT and use it instead of modifying the stream in the mov demuxer.
Originally committed as revision 11638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 19:57:04 +00:00
Evgeniy Stepanov
f8d7c9d373 Add support for Matroska attachments.
patch by eugeni _dot_ stepanov _at_ gmail.com and myself

Originally committed as revision 11635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-27 15:43:17 +00:00
Michael Niedermayer
cc8d87b793 Set subtitle codec id correctly, i hope this does not break anything.
Originally committed as revision 11627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:57:53 +00:00
Michael Niedermayer
e73e3a926d Add non standard id needed for dvd subtitles.
Originally committed as revision 11626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-26 22:55:34 +00:00