Commit Graph

4126 Commits

Author SHA1 Message Date
Carl Eugen Hoyos 9f2ace74ef Fix two identical warnings when compiling riff.c and nuv.c with icc:
warning #188: enumerated type mixed with another type

Originally committed as revision 16281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 22:12:44 +00:00
Carl Eugen Hoyos 1c53290b67 Fix a warning when compiling with icc:
warning #188: enumerated type mixed with another type

Originally committed as revision 16280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 22:10:07 +00:00
Aurelien Jacobs 9daa4ceaa3 Initialize s->opaque before calling url_resetbuf().
Fixes a regression test crash for icc 10.1 64 bit.

Patch by Aurelien.

Originally committed as revision 16271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 11:23:00 +00:00
Michael Niedermayer c96bd21227 Change mpeg audio parser so it only sets frame_size, channels and bit_rate
after it has a few valid frames.
Fixes issue762

Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 23:50:16 +00:00
Michael Niedermayer 2f3d7ea974 Fix detection of audio codec in K70707-ARIA229.flv.
Fixes issue760.

Originally committed as revision 16254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 20:56:30 +00:00
Alexander Strange 1ca610c015 Allocate and clear FF_INPUT_BUFFER_PADDING_SIZE bytes at the end of mkv
extradata.

Fixes valgrind invalid read warnings during H.264 extradata parsing.

Originally committed as revision 16229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-19 01:00:44 +00:00
Baptiste Coudurier 364df7b7b9 cosmetics, remove useless parenthesis and whitespaces
Originally committed as revision 16213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 09:18:43 +00:00
Baptiste Coudurier a15328249d set alac channels from extradata, fix alac mono in m4a
Originally committed as revision 16212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 09:17:19 +00:00
Ronald S. Bultje 1d217cdb3f Make asf_get_packet() and asf_parse_packet() public for use in RTSP-MS and
give them a ff_ prefix. See "[PATCH] asf.c: make functions of interest for
MS-RTSP public" thread on ML.

Originally committed as revision 16205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 01:28:29 +00:00
Ronald S. Bultje d7fb5a18fc Add a ByteIOContext argument to ASF functions that will be shared with the
RTSP stack for RTSP-MS support. This way, they can read input from any given
input source. See discussion in "[PATCH] add gb argument to ASF functions of
interest to MS-RTSP" ML thread.

Originally committed as revision 16204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-18 01:25:43 +00:00
Benoit Fouet 8b2386dc5a Add jp2 support to img2 demuxer.
On behalf of Jai Menon

Originally committed as revision 16187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 11:22:51 +00:00
Baptiste Coudurier 18cb36fd57 activate jpeg2000 fourcc in mov/mj2
Originally committed as revision 16185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-17 08:09:09 +00:00
Michael Niedermayer ca5b528ea1 Fix bug where the avi demxuer lost the first frame of malformed
ODML avis.
Fixes VS2k5DebugDemo-01-partial.avi

Originally committed as revision 16167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 16:14:07 +00:00
Baptiste Coudurier 271344377a check that nb_streams is valid before setting stream, fix crash with jp2 which do not use same structure
Originally committed as revision 16166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 08:47:28 +00:00
Ben Littler f86cd76138 add MPNG fourcc
fixes http://sceneish.ath.cx/stuff/netmap/netmap.avi

Originally committed as revision 16163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 05:22:53 +00:00
Ben Littler 4a49a5fdfc two more mpeg4 fourccs and one msmpeg4v3 from uncommon codec list
Originally committed as revision 16162 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 05:20:11 +00:00
Ben Littler a9cf309b96 QIVG fourcc, fixes http://rodweb.dip.jp/partner/check.avi
Originally committed as revision 16161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 03:49:26 +00:00
Ben Littler c6340f86a3 add rpza avi fourcc
Originally committed as revision 16160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-16 03:42:10 +00:00
Ronald S. Bultje b9b2b8c93b Use get_buffer() and url_fskip() for some loops of get_byte()s. See discussion in ML thread
"[PATCH] rmdec.c: use get_buffer and skip_bytes instead of loops of get_byte".

Originally committed as revision 16139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 22:26:28 +00:00
Ronald S. Bultje 127ed7b07b Reindent something that looks weird.
Originally committed as revision 16138 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 22:24:58 +00:00
Ronald S. Bultje b965ff352f Add comment to indicate why the SDP line buffer is as big as it is.
Originally committed as revision 16137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 22:23:59 +00:00
Ronald S. Bultje e322d3f5be Increase SDP line buffer size because ASF headers in RTSP-MS are very big. See ML discussion
in "rtsp.c: increase SDP line buffer size" thread.

Originally committed as revision 16136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 22:23:14 +00:00
Michael Niedermayer a3bb564ee5 10l (forgot sample_size)
Should fix fate.

Originally committed as revision 16133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 20:38:05 +00:00
Stefano Sabatini 7a961a46ba Make register_avcodec() call avcodec_init().
This avoids the possibility to use a registered codec without first
initializing libavcodec, which resulted in unexpected behavior.

Originally committed as revision 16131 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 20:04:00 +00:00
Måns Rullgård eedfe2227a oggflac: fix bitstream reader usage
Originally committed as revision 16129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 17:30:18 +00:00
Michael Niedermayer 25983dcd53 Fix non interleaved variable fps ODML avis.
Fixed issue738

Originally committed as revision 16127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 15:48:48 +00:00
Michael Niedermayer 492322fccc Remove silly FIXME comment.
Originally committed as revision 16122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 14:01:12 +00:00
Mike Melanson 02fb2546e8 The POSIX namespace shall be held sacrosanct. To that end,
continue eliminating _t from structure names in FFmpeg.

Originally committed as revision 16118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 03:29:33 +00:00
Luca Abeni be73a544af Rename rtp_payload_data_t to avoid clashes with the POSIX namespace
Originally committed as revision 16115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 23:25:19 +00:00
Luca Abeni 1afe09d515 Remove useless typedef
Originally committed as revision 16114 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 23:20:05 +00:00
Luca Abeni d5574b2839 Remove unused types
Originally committed as revision 16113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 23:03:34 +00:00
Reimar Döffinger d77ac324fe Avoid _t in gxf enum type names
Originally committed as revision 16112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 21:58:17 +00:00
Ronald S. Bultje 1edddc99dc Split RMContext into RMDemux/MuxContext and make them private in rmdec/enc.c.
Reason for this is that there are no shared entries in the demuxer/muxer
context, making it a mystery as to why it was shared between the two. See
"[PATCH] clean rmdemux/muxcontext" patch on mailinglist.

Originally committed as revision 16111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 21:40:20 +00:00
Ronald S. Bultje a15ebf34c7 Don't access RMContext directly in rdt.c. Rather, use the return value of
ff_rm_parse_packet() to indicate whether more audio packets are available
in the demuxer from the last RM frame, and save that in the RDT parsing
context. See patch/discussion in "[PATCH] rdt.c: don't access RMContext"
on ML.

Originally committed as revision 16110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 21:37:27 +00:00
Ronald S. Bultje f27544fd5b Separate the packet fetching from the data reading, so that the data reading
function is assured to parse at most one packet. This makes this function
useful for ASF data packet parsing in a "push-mode" in addition to the
current "pull-mode", and therefore allows for use of these functions in,
for example, the RTSP demuxer (for MS-RTSP support). Tested to give identical
output before and after for regular ASF playback, also see discussion in the
ML thread "[PATCH] asf.c: move packet_time_start=0 statement". Testsuite also
works after the patch, tested by Benoit Fouet.

Originally committed as revision 16108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 17:18:11 +00:00
Diego Biurrun 8a9572c26f 100l: Add missing backslashes.
Originally committed as revision 16107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 17:04:22 +00:00
Diego Biurrun 6d99b2285d cosmetics: Break some lines for a more aesthetically pleasing result.
Originally committed as revision 16106 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 16:35:58 +00:00
Diego Biurrun 3445c7992b Remove misleading comment, _t is POSIX-reserved namespace.
Originally committed as revision 16105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 16:08:31 +00:00
Diego Biurrun 7f37f5687d whitespace cosmetics
Originally committed as revision 16100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 13:39:13 +00:00
Jai Menon f98dcdedda Avoid _t in identifier names, _t is reserved by POSIX.
patch by Jai Menon, jmenon86 gmail com

Originally committed as revision 16098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 13:11:42 +00:00
Anders Grönberg b77aba0a8c Matroska uses tables from isom.c, so add the object file to its dependencies.
extracted from a patch by Anders Grönberg, galileo.m2 gmail com

Originally committed as revision 16096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 12:46:11 +00:00
Luca Barbato 644e7acba4 Rename type to be consistent
Originally committed as revision 16090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 10:45:44 +00:00
Måns Rullgård 8c39a7582d mpegts: replace Program_t typedef with "struct Program"
Originally committed as revision 16086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-13 00:04:34 +00:00
Aurelien Jacobs 737dccfc1d matroska: sort codec tags list
Originally committed as revision 16081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 16:04:15 +00:00
Kurtnoise ea2a5dec33 matroska: add dirac support (patch by Kurtnoise kurtnoise _at_ free _dot_ fr)
Originally committed as revision 16080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 15:55:08 +00:00
Ben Littler 41b0534a7a add another mpeg4 avi fourcc from uncommon codecs list
Originally committed as revision 16079 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 15:34:55 +00:00
Dave Yeo c0a8f8d498 Add sys/time.h header #include, fixes compilation on OS/2.
patch by Dave Yeo, daveryeo telus net

Originally committed as revision 16077 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 06:55:48 +00:00
Oded Shimon bffc76bd17 Update lavf/libnut.c to _tt type names in libnut API
Originally committed as revision 16075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-12 05:10:43 +00:00
Aurelien Jacobs e998ba4fbc avoid POSIX reserved _t suffix
Originally committed as revision 16067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 22:34:14 +00:00
Baptiste Coudurier 6da5407401 parse pasp atom and set sample aspect ratio,
warn if transformation matrix differs from pasp,
based on a patch by Skal.

Originally committed as revision 16066 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 22:24:56 +00:00