virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Code Issues Releases Activity
17,572 Commits 37 Branches 400 Tags 464 MiB
74334ae11e
Commit Graph

4319 Commits

Author SHA1 Message Date
Luca Abeni
0a63a676ec Do not reallocate AVPacket's data when muxing a packet 
Originally committed as revision 16616 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 14:03:07 +00:00
Alex Converse
2ea512a6c2 Factorise id3v2 header parsing from mp3.c to be shared 
Patch by Alex Converse ( alex converse gmail com )

Originally committed as revision 16615 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 12:23:03 +00:00
Baptiste Coudurier
f3ba7c5468 use delay for subs and dirac too 
Originally committed as revision 16614 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 01:47:24 +00:00
Baptiste Coudurier
a57fb91ce5 add aud nal unit if not present in h264 bitstream 
Originally committed as revision 16613 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 01:22:31 +00:00
Aurelien Jacobs
e0e4be590c matroskadec: ensure we only consider chapters which are properly ordered 
Originally committed as revision 16612 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-15 00:42:57 +00:00
Baptiste Coudurier
89ac55ada9 consider other codecs packets contain only one access unit, not just audio 
Originally committed as revision 16611 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 23:53:31 +00:00
Baptiste Coudurier
3d0a94f699 calculate pat, pmt and sdt exact size and adjust total bitrate 
Originally committed as revision 16610 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 23:49:13 +00:00
Baptiste Coudurier
620b9df7a7 allow user to specify muxrate 
Originally committed as revision 16609 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 23:30:49 +00:00
Baptiste Coudurier
811a0aa785 warn if dts < pcr which means TS is invalid 
Originally committed as revision 16607 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 22:40:37 +00:00
Baptiste Coudurier
5541759f6f only write dts if they differ from pts, according to specs 
Originally committed as revision 16605 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 22:17:07 +00:00
Baptiste Coudurier
46911c7ab8 use delay to avoid negative dts 
Originally committed as revision 16604 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 22:14:35 +00:00
Baptiste Coudurier
de34dc39c0 set pts and dts of pes packets exactly according to specs 
Originally committed as revision 16603 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 21:57:10 +00:00
Aurelien Jacobs
49fb20cb8a replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ 
and remove all ENABLE_ definitions.

Originally committed as revision 16600 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 17:19:17 +00:00
Baptiste Coudurier
b5931348bc compute pcr more accurately, regression tests need update 
Originally committed as revision 16596 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 02:20:26 +00:00
Baptiste Coudurier
c91662ce83 include intreadwrite.h, fix compilation, img2.c use AV_RL32 
Originally committed as revision 16595 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 01:21:24 +00:00
Baptiste Coudurier
6d32ec6ce9 cleanup gif, use BISTREAM_WRITER_LE 
Originally committed as revision 16591 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-14 00:27:43 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*. 
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 23:44:16 +00:00
Ben Littler
ed0879eda9 add SLMJ fourcc to mjpeg 
Originally committed as revision 16579 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 17:10:10 +00:00
Aurelien Jacobs
8eec0fb674 fix version protection 
Originally committed as revision 16572 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-13 00:20:18 +00:00
Måns Rullgård
7b114c0925 AVI: add bswap.h include needed on big endian 
Originally committed as revision 16564 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-12 00:07:40 +00:00
David Conrad
6cdbff63cd Use the dimensions in tkhd for timed text tracks 
Originally committed as revision 16561 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 23:24:28 +00:00
Diego Biurrun
6a5d31ac25 Fix build: Add intreadwrite.h and bswap.h #includes where necessary. 
Originally committed as revision 16556 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:19:48 +00:00
Ramiro Polla
b507ebd179 Use setmode() if it exists in <io.h>, and not based on O_BINARY. 
Originally committed as revision 16553 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 22:05:43 +00:00
Diego Biurrun
470bce2b55 cosmetics: indentation 
Originally committed as revision 16550 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:08:52 +00:00
Diego Biurrun
c54286ab08 Fix illegal identifier starting with an underscore. 
Originally committed as revision 16549 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:07:12 +00:00
Baptiste Coudurier
64d50fa551 move ffindex set before mov_read_default so it can be used in functions 
Originally committed as revision 16548 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 21:04:25 +00:00
Baptiste Coudurier
87609b51da cosmetics 
Originally committed as revision 16535 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:42:24 +00:00
Baptiste Coudurier
985688b8e5 remove warnings about uninitialized vars 
Originally committed as revision 16534 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:41:43 +00:00
Baptiste Coudurier
3d1b0fcd59 cosmetics 
Originally committed as revision 16532 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:36:19 +00:00
David Conrad
f620488654 Add support for muxing mov/mp4/3gp timed text streams 
Originally committed as revision 16531 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 10:26:44 +00:00
David Conrad
58e9f2edb6 Read extradata (justification, colors, fonts, etc) for mov/mp4 timed text 
Originally committed as revision 16530 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 08:24:44 +00:00
Baptiste Coudurier
fd7f59639c remove comment, this is not relevant anymore 
Originally committed as revision 16528 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 05:24:41 +00:00
Baptiste Coudurier
2ba0470e81 reindent 
Originally committed as revision 16527 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 05:23:46 +00:00
Baptiste Coudurier
7d637efa80 check for negative dts value even if bitstream is already formated, 
this fixes dts when stream copying.

Originally committed as revision 16526 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-11 05:23:10 +00:00
Stefano Sabatini
708ec8fb31 Move the AVFormatContext options definition to a dedicated file, 
reduce the utils.c clutter.

Originally committed as revision 16516 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-10 09:56:07 +00:00
Ronald S. Bultje
9211bcddb4 Reindent to properly fit a 80 chars terminal. 
Originally committed as revision 16511 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 23:44:52 +00:00
Ronald S. Bultje
ff16f551cf Reindent after r16509. 
Originally committed as revision 16510 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 23:36:39 +00:00
Ronald S. Bultje
83d14c85da Apply rtpmap: SDP lines to the last m= line only, since they generally just 
come directly after each m= line if required. See "[PATCH] RTSP-MS 5-6/15:
parse only the last m= line stream per rtpmap line" thread on ML.

Originally committed as revision 16509 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 23:36:17 +00:00
Baptiste Coudurier
fa50a0276f only set le if value is 1, fix boom5.mov, issue #770 
Originally committed as revision 16507 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 22:13:37 +00:00
Luca Abeni
65007a4fa0 Do not assume that if pkt->destruct != av_destruct_packet then it is not 
necessary to call the destruct method

Originally committed as revision 16506 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 20:10:13 +00:00
Ronald S. Bultje
e49906c321 Increase buffer size for RTP packet data because some ASF streams use a 
manual, non-standard blocksize which is bigger than RTP_MAX_PACKET_LENGTH.
See "[PATCH] RTSP-MS 4/15: blocksize detection" thread on mailinglist.

Originally committed as revision 16502 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 01:30:14 +00:00
Aurelien Jacobs
5ce0043367 rename ff_metadata_sync_compat to ff_metadata_mux_compat 
Originally committed as revision 16501 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-09 00:01:42 +00:00
Aurelien Jacobs
97ca83a566 move ff_metadata_sync_compat to metadata_compat.c 
Originally committed as revision 16500 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 23:30:02 +00:00
Aurelien Jacobs
e99f76ab79 Add a second metadata compatibility layer, so that metadata that gets 
demuxed with new API is automatically converted to the old API,
allowing old applications to stay functional.

Originally committed as revision 16499 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 23:24:51 +00:00
Ben Littler
54f8abde93 cosmetics: CJPG is from Creative Webcam 
Originally committed as revision 16497 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 18:00:51 +00:00
Ben Littler
949462b32e fourcc CJPG is sequential jpeg 
Originally committed as revision 16496 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 17:51:03 +00:00
Baptiste Coudurier
15cdff8525 100l, add missing enum type, fix compilation 
Originally committed as revision 16495 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 07:11:43 +00:00
Baptiste Coudurier
8a47ad5e7c use lower case x and alternate format for hex in printf 
Originally committed as revision 16494 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 02:57:21 +00:00
Baptiste Coudurier
861b4f012a print more debug information if enabled, including index 
Originally committed as revision 16493 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-08 02:54:43 +00:00
Dominique Leuenberger
6fde7afa8d Fix a compiler warning: 
libavformat/rmdec.c:550: warning: assignment makes pointer from integer

Patch by Dominique Leuenberger (dominique-ffmpeg-devel A leuenberger D net)

Originally committed as revision 16489 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 23:37:03 +00:00
Michael Niedermayer
9f06bd9e96 Do not try to duplicate packets that have data==NULL. 
Originally committed as revision 16483 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 20:44:23 +00:00
Ronald S. Bultje
6e5f27ca80 Fix typo ("Standard-compliant" -> "Standards-compliant"), as noticed by 
Diego.

Originally committed as revision 16475 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 16:01:15 +00:00
Ronald S. Bultje
70d4b8ce50 Fix doxy comments missing one '*'. 
Originally committed as revision 16473 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 15:13:27 +00:00
Ronald S. Bultje
7a86bafa20 Use the "server" RTSP field to detect whether the server that we're talking 
to is a Microsoft Windows Media Server (the field will be "WMServer/version").
See "[PATCH] RTSP-MS 3/15: Add Windows Media Server type" thread on
mailinglist.

Originally committed as revision 16472 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:55:47 +00:00
Ronald S. Bultje
74272b1c0c Export RTSPState and RTSPStream from rtsp.c into rtsp.h. This allows future 
access to these structures in functions that will be located in rtp_asf.c.
See "[PATCH] RTSP-MS 2/15: export RTSPState and RTSPStream" mailinglist
thread.

Originally committed as revision 16471 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:53:04 +00:00
Ronald S. Bultje
b0d75d6036 Don't use s->pb if a local ByteIOContext was already provided by the calling 
function. See mailinglist thread "[PATCH] RTSP-MS 1/15: don't use s->pb in
asf.c".

Originally committed as revision 16470 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:50:19 +00:00
Ronald S. Bultje
572c6a3814 Allow subscription to any of the streams, not just the first, available in 
this RTSP/RDT session. This basically implies full RDT support, including
stream selection in ffmpeg and multi-stream backupping in ffmpeg (by mapping
each stream to an output). See "[PATCH] RTSP/RDT: subscriptions" thread on
mailinglist.

Originally committed as revision 16469 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:48:17 +00:00
Ronald S. Bultje
7c68a17754 Parse the OpaqueData field for every AVStream represented by this "set of 
streams" (a single RTSPStream / RDTDemuxContext can represent several
AVStreams, that's just how Real/RDT was designed...). This will fill in
most of the AVStream/AVCodecContext header fields, similar to reading a
RM file header would. See "[PATCH] multi-stream MDPR parsing" thread on
mailinglist.

Originally committed as revision 16468 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:45:13 +00:00
Ronald S. Bultje
530bca9439 Parse the bitrate field in the ASMRuleBook ("AverageBandwidth") to fill in 
the AVStream->AVCodecContext->bit_rate field, which is not in the MDPR block
(the "OpaqueData" SDP field). This allows clients to choose streams based
on their bitrate, which is what most network-players base stream selection
on. (Of course, it is also possible to select based on anything else, that
is entirely up to the client.) See "[PATCH] rdt.c: ASM rulebook bitrate
reading" thread on mailinglist.

Originally committed as revision 16467 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:41:40 +00:00
Ronald S. Bultje
3ca45429fe Parse the ASMRuleBook SDP line to dynamically create one new AVStream for 
each "rule" described in the ASMRuleBook. Each rule represents a stream
of identical content compared to other streams in the same rulebook, but
with a possibly different codec/bitrate/etc. See "[PATCH] rdt.c: ASM
rulebook parsing and AVStream creation" thread on mailinglist.

Originally committed as revision 16466 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 14:38:44 +00:00
Diego Biurrun
3a8e375acf Remove inappropriate const qualifier from function argument, fixes the warning: 
libavformat/dvenc.c:256: warning: passing argument 2 of ‘av_fifo_generic_write’ discards qualifiers from pointer target type

Originally committed as revision 16460 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-07 01:19:48 +00:00
Aurelien Jacobs
094d9df72e free all allocated metadata structures 
Originally committed as revision 16457 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 22:11:04 +00:00
Diego Biurrun
ec0052760e cosmetics: alphabetical order 
Originally committed as revision 16454 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 17:50:10 +00:00
Aurelien Jacobs
7cfe7d77a4 ignore year=0 and track=0 
Originally committed as revision 16452 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 12:56:21 +00:00
Aurelien Jacobs
176aee8282 Add a metadata compatibility layer, so that when a user application set 
metadata using old API, it is automatically converted to new API before
muxing.

Originally committed as revision 16447 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-06 00:09:23 +00:00
Aurelien Jacobs
e232c2529e add a typedef for AVMetadata 
Originally committed as revision 16446 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 23:56:27 +00:00
Diego Biurrun
52e57500bb Revert deprecation of AVFrac structure. Attempts to replace AVFrac have turned 
out to be unsatisfying and confidence in AVFrac has been restored.

Originally committed as revision 16441 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 22:10:16 +00:00
Roman Shaposhnik
6d8b21f3e8 additional recovery for the badly broken streams 
Originally committed as revision 16438 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-05 17:50:13 +00:00
Aurelien Jacobs
bc1d2afb37 rename AVMetaData to AVMetadata and meta_data to metadata 
Originally committed as revision 16430 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 23:31:31 +00:00
Aurelien Jacobs
f526adaf19 add metadata in AVStream, AVProgram and AVChapter 
Originally committed as revision 16428 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 22:31:55 +00:00
Mike Melanson
ea29242cc7 Ministry of English Composition treatment for the new metadata API 
Originally committed as revision 16427 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 20:47:09 +00:00
Michael Niedermayer
06a7bd9a2e 10l format include path for metadata.h 
Originally committed as revision 16426 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 19:00:35 +00:00
Michael Niedermayer
a6d18a0e6a Move metadata API from avcodec to avformat. 
Originally committed as revision 16425 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 18:58:49 +00:00
Michael Niedermayer
47146dfbf6 Generic metadata API. 
avi is updated as example.
No version bump, the API still might change slightly ...
No update to ffmpeg.c as requested by aurel.

Originally committed as revision 16424 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 18:48:37 +00:00
Yoav Steinberg
853a97530e If we find a VBR tag at the beginning of the file don't attempt to 
parse it as a valid frame.
patch by (Yoav Steinberg yoav out monfort in co in il)

Originally committed as revision 16421 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 16:23:18 +00:00
Stefano Sabatini
1ca9133fb4 Drop the deprecated parse_image_size() and parse_frame_rate() functions 
at the next libavformat major version bump.

Originally committed as revision 16420 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-01-04 11:04:02 +00:00
Michael Niedermayer
ce0453aac9 10l set AVPacket.size to the true size of the returned data instead of 
the (larger) allocated size. (prevents segfaults due to later failures
from 900MB-sized packets, yes fuzzed file not a valid one)

Originally committed as revision 16404 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 02:47:54 +00:00
Michael Niedermayer
188e67eaf4 Fix indention which was off by 1 space. 
Originally committed as revision 16403 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 01:54:54 +00:00
Michael Niedermayer
0b4ff0c9ef Replace buffer by AVPacket and avoid a memcpy() for video when the number 
of allocated slices matches the actual.
Audio still does a copy (marked with FIXME in the code so this is not missed).

Originally committed as revision 16402 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 01:53:12 +00:00
Michael Niedermayer
fce48f5b0b Merge videobuf and audiobuf. 
Originally committed as revision 16401 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-31 00:24:54 +00:00
Michael Niedermayer
f48d545736 Simplify the top of rm_assemble_video_frame(). 
Originally committed as revision 16400 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 21:23:02 +00:00
Michael Niedermayer
e45673cb3a Add a few error checks to rm_assemble_video_frame() 
Originally committed as revision 16399 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 20:51:18 +00:00
Michael Niedermayer
51d6852f43 All non zero returns of rm_assemble_video_frame() are errors, check things 
accordingly.

Originally committed as revision 16398 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-30 19:49:27 +00:00
Reimar Döffinger
7d204e67e8 av_free() -> av_freep(), patch by Reimar Doffinger, see discussion in 
"rmdec.c: double free" thread on mailinglist.

Originally committed as revision 16379 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 23:25:17 +00:00
Ronald S. Bultje
c49a3ec30a Fix double free which happens for playback of .rm files after r16365. See 
"rmdec.c: double free" discussion on mailinglist, patch with suggestions
from Reimar Doffinger.

Originally committed as revision 16378 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 23:23:59 +00:00
Kostya Shishkov
5b3658f73b Fix a typo that made VMD demuxer always assume Indeo 3 as video codec. 
Spotted by Robert Swain

Originally committed as revision 16371 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 16:22:42 +00:00
Ronald S. Bultje
ade8fb4d75 Reindent after r16368. 
Originally committed as revision 16369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:59:11 +00:00
Ronald S. Bultje
a9f84821c5 Add audio_pkt_cnt return value to ff_rm_retrieve_cache(). See discussion in 
"[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16368 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:58:23 +00:00
Ronald S. Bultje
5d88c2647d Change audio_pkt_cnt from an array into a single field, since only a single 
member of the array is ever used (compare to RMDemuxContext->audio_pkt_cnt).
See "[PATCH] oops I broke rdt.c" mailinglist thread.

Originally committed as revision 16367 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 05:55:09 +00:00
Ronald S. Bultje
886e89d0d0 Add RMStream object as function argument to public functions so that non-.rm 
AVStreams can be used to call these public rmdec.c functions as well, as is
the case for RDT/RTSP streams. See mailinglist discussion in "[PATCH] rdt.c:
don't reuse the same AVStream in both RTSP and RM demuxer" thread.

Originally committed as revision 16366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 00:21:11 +00:00
Ronald S. Bultje
ba61472911 Implement RMStream stream-specific private data object in the RM demuxer. 
This allows multiple video or audio streams per .rm file. See mailinglist
thread "[PATCH] rmdec.c: implement RMVideo/AudioStream".

Originally committed as revision 16365 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-28 00:18:38 +00:00
Kostya Shishkov
10f35ebddd Latest Coktel Vision VMDs contained Indeo 3, add demuxer support for it 
Originally committed as revision 16363 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-27 17:34:00 +00:00
Ben Littler
c26436ec46 add amr in avi riff tags 
Originally committed as revision 16303 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-24 02:20:07 +00:00
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
Baptiste Coudurier
c3e92a6cb4 remove _t in typedef for POSIX compatibility 
Originally committed as revision 16063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 20:06:56 +00:00
Michael Niedermayer
089e1bcf10 Remove comment suggesting using variables ending in _t as this would break POSIX. 
Originally committed as revision 16061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 20:02:15 +00:00
Reimar Döffinger
b4be93212f Avoid _t in typedef type 
Originally committed as revision 16058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 19:19:23 +00:00
Michael Niedermayer
52afa376b8 remove _t for POSIX compatibility. 
Originally committed as revision 16057 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 19:06:24 +00:00
Ronald S. Bultje
76f940b21e Fix indenting. 
Originally committed as revision 16056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 18:48:08 +00:00
Reimar Döffinger
4e5b854e4c Use "struct gxf_stream_info" instead of "st_info_t", 
avoids a typedef that is not really worth it and the
reserved POSIX _t namespace.

Originally committed as revision 16054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 10:42:06 +00:00
Reimar Döffinger
c370a7040b Remove useless and confusing (since they are also used in gxfenc.c) /* gxf.c */ comment. 
Originally committed as revision 16053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2008-12-11 10:35:20 +00:00