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
Mike Melanson
65fec2d98f
add 'ACDV' FourCC (which is just complete JPEG files in individual AVI
...
frames) and 'azpr' FourCC (which is Apple's 'rpza', encapsulated in AVI
instead)
Originally committed as revision 16052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-11 07:49:05 +00:00
Ben Littler
6cffaea8db
add mpeg2 fourcc and aac format tag from asf
...
Originally committed as revision 16036 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-08 20:09:15 +00:00
Jindřich Makovička
36b532815c
bind to the multicast address if possible
...
Originally committed as revision 16032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-07 17:29:09 +00:00
Reynaldo H. Verdejo Pinochet
7100376f75
COSMETICS
...
Originally committed as revision 16028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-07 01:53:31 +00:00
Ronald S. Bultje
dc50773dc5
Remove static variable and a printf using it. See "[PATCH] asf.c: move
...
packet_time_start=0 statement" thread on ML.
Originally committed as revision 16025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-06 20:28:38 +00:00
Ronald S. Bultje
7b2a070800
Change function prototype of the sdp_parse_a_line in DynamicProtocolHandler.
...
This function is called in rtsp.c for each a= line in the SDP of the Describe
response after m= RTSP stream descriptors. The function prototype used to
take an AVStream argument. For RDT, however, every RTSPStream represents
a set of streams of identical content, and can thus represent multiple
AVStreams. Therefore, it should not take an AVStream as argument. This
patch modifies it to accept a AVFormatContext (of the RTSP/SDP demuxer)
instead. See discussion in "[PATCH/RFC] change function prototype of
parse_sdp_a_line" thread on ML.
Originally committed as revision 16024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-06 18:41:17 +00:00
Ronald S. Bultje
022f0b7c01
Do not access s->gb directly in functions that have a local copy of that
...
variable. See "[PATCH] asf.c: don't access AVFormatContext->pb" thread on
ML.
Originally committed as revision 16023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-06 18:35:52 +00:00
Ben Littler
62d6f73edc
add VX1K h263 and DMK2 mpeg4 avi fourccs
...
Originally committed as revision 16009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-05 14:59:41 +00:00
Carl Eugen Hoyos
485cfbe806
Recognize pnm file as images.
...
Originally committed as revision 16004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 15:08:04 +00:00
Baptiste Coudurier
4d35964d01
WRAW fourcc
...
Originally committed as revision 16001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-04 03:00:53 +00:00
Diego Biurrun
ecfb51d1c2
Add necessary header for av_set_program_name and av_program_add_stream_index.
...
Originally committed as revision 15996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 23:04:30 +00:00
Ben Littler
26e8d342c0
add fourccs from avi files
...
Originally committed as revision 15995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 21:44:29 +00:00
Michael Niedermayer
b8cf645bd2
add GEOX fourcc for mpeg4
...
Originally committed as revision 15992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 16:49:58 +00:00
Diego Biurrun
bad4063740
Move declaration of av_set_program_name and av_program_add_stream_index
...
to a more sensible place.
Originally committed as revision 15991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 16:47:07 +00:00
Diego Biurrun
9686df2be5
Delete unnecessary 'extern' keywords.
...
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 15:23:30 +00:00
Ben Littler
26ae363e06
add FFDS fourcc, ok'd by kostya
...
fixes FFDS files in http://tranquillity.ath.cx/uncommon_video_codecs_final.txt
Originally committed as revision 15989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-03 13:53:13 +00:00
Kenan Gillet
73b458e354
Commit last ok'ed parts of QCELP decoder and enable it.
...
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-02 16:48:05 +00:00
Michael Niedermayer
2ba0cdd527
ADTS AAC probe.
...
fixes issue400
Originally committed as revision 15977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-02 15:43:47 +00:00
Kenan Gillet
061f407e53
More OKed parts of the QCELP decoder
...
patch by Kenan Gillet, kenan.gillet gmail com
Originally committed as revision 15975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-01 22:07:00 +00:00
Ronald S. Bultje
7960e18fdf
Implement rule-number parsing, the initial step in stream (and bitrate)
...
selection. See discussion in ML thread "[PATCH] RDT/Realmedia patches #2 ".
Originally committed as revision 15966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-01 00:08:42 +00:00
Ronald S. Bultje
4f60285658
Change RDTDemuxContext->st into an array of streams, which will make future
...
patches adding stream-selection easier in code. See discussion in ML thread
"[PATCH] RDT/Realmedia patches #2 ".
Originally committed as revision 15964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-30 22:24:35 +00:00
Ronald S. Bultje
79a1f3c023
document ff_rdt_parse_open(). See ML discussion in "[PATCH] RDT/Realmedia
...
patches #2 " thread.
Originally committed as revision 15963 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-30 20:40:04 +00:00
Ronald S. Bultje
e0d1eabf14
Change function prototype from taking an AVStream to taking an index to the
...
stream itself, plus a name change to signify that there may be multiple
AVStreams per RDT set. See discussion in "[PATCH] RDT/Realmedia patches #2 "
thread on ML.
Originally committed as revision 15962 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-30 20:39:16 +00:00
Stefano Sabatini
91cd7eb633
Rename functions in sdp.c for consistency's sake.
...
Originally committed as revision 15953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-29 13:55:03 +00:00
Ronald S. Bultje
63f412f902
Document 'ic' variable. See "[PATCH] RDT/Realmedia patches #2 " thread in ML.
...
Originally committed as revision 15916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-23 16:54:31 +00:00
Carl Eugen Hoyos
a8e4161333
Add forgotten file format pgmyuv.
...
Originally committed as revision 15910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-22 21:24:39 +00:00
Carl Eugen Hoyos
6bbb5bf83c
Support picture output without -f image2 for most codecs.
...
Originally committed as revision 15909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-22 20:36:02 +00:00
Diego Biurrun
f0e602351e
cosmetics: Consistently place HEADERS before OBJS in all Makefiles.
...
Originally committed as revision 15896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-20 22:53:18 +00:00
Baptiste Coudurier
12e416c848
decrease atom size, fix broken files missing version/flags
...
Originally committed as revision 15872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-18 09:09:57 +00:00
Reynaldo H. Verdejo Pinochet
a45bdbc4f5
Trivial, Cosmetics
...
Originally committed as revision 15871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-18 03:49:33 +00:00
Ronald S. Bultje
9168f7e671
Change type of prev_stream_id from uint32_t to int, since it has a max size
...
of 16bits. See discussion in "[PATCH] RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 18:10:02 +00:00
Ronald S. Bultje
90e0450fa8
Reindent after r15853.
...
Originally committed as revision 15854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:32:56 +00:00
Ronald S. Bultje
43af8b2b42
Read optional components of the RDT packet header, such as extended setID
...
and streamID and the length. of the packet in case of packet concatenation.
Discussed in ML thread "[PATCH] RDT/Realmedia patches #2 ".
Originally committed as revision 15853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:32:01 +00:00
Ronald S. Bultje
6bafd6f53e
Change header reading implementation to using get_bits() instead of directly
...
accessing the data array. This allows to easily read optionally available
header bits without causing pains. See discussion in "[PATCH] RDT/Realmedia
patches #2 " thread on ML.
Originally committed as revision 15852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:30:31 +00:00
Ronald S. Bultje
e269ab791d
Prefix all ff_rdt_parse_header() arguments with a p, preparing for local
...
variables to temporary hold the values. Discussed in ML thread "[PATCH]
RDT/Realmedia patches #2 ".
Originally committed as revision 15851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:28:12 +00:00
Ronald S. Bultje
a4b8cb3c55
Fix memleak caused by the fact that url_open_buf() allocates a context
...
when calling, but url_close_buf() doesn't free it. The better solution
is to not allocate it at all, init it with init_put_byte() and then
not have to close it at all. In the case where we do need to hold it
around for longer than within the function context, we allocate it with
av_alloc_put_byte() and free it with av_free() instead. Discussed in ML
thread "[PATCH] fix small memleak in rdt.c".
Originally committed as revision 15850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:23:20 +00:00
Ronald S. Bultje
fcc995a533
Add ByteIOContext argument to public ff_rm_* functions so that we can
...
specify the data source as function argument instead of in s->pb before
calling the function. Discussed in ML thread "[PATCH] fix small memleak
in rdt.c".
Originally committed as revision 15849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 14:20:00 +00:00
Jindřich Makovička
ce09d560b7
Get rid of MSG_DONTWAIT using a more standard way to use a socket
...
in a non blocked mode.
Patch by Jindrich Makovicka: makovick gmail
Originally committed as revision 15846 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-17 07:50:25 +00:00
Baptiste Coudurier
ebd610557e
set pts in flv demuxer
...
Originally committed as revision 15841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 02:56:34 +00:00
Baptiste Coudurier
51c1520114
read itunes metadata, code based on Reimar's patch
...
Originally committed as revision 15840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 01:59:35 +00:00
Ronald S. Bultje
e3b7216b9b
Change status packet skipping to be more spec-compliant. See discussion in
...
"[PATCH] RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:45:26 +00:00
Ronald S. Bultje
108cd24793
Make function comment a bit more linguistically correct.
...
Originally committed as revision 15835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:43:57 +00:00
Ronald S. Bultje
3d883ad5f3
Reindent after r15833.
...
Originally committed as revision 15834 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:42:41 +00:00
Ronald S. Bultje
114732f4c7
Add is_keyframe param to ff_rdt_parse_header(). See ML discussion in
...
"[PATCH] RDT/Realmedia patches #2 " thread.
Originally committed as revision 15833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:41:59 +00:00
Baptiste Coudurier
86b0affd08
simplify metadata reading
...
Originally committed as revision 15830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 20:17:19 +00:00
Aurelien Jacobs
8f569ed08f
matroskadec: fix index timestamps for some broken files
...
fix issue697
Originally committed as revision 15829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 15:34:51 +00:00
Ronald S. Bultje
6ff1f61530
Call check_back_and_send_rr() function only in case of RTP as a transport.
...
Don't call it for RDT, since it is unneeded and it doesn't provide a
RTPDemuxContext, leading to some memory errors. See "[PATCH] fix small
memory error in rtsp.c" thread on ML.
Originally committed as revision 15828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 14:44:48 +00:00
Ronald S. Bultje
239dec21ab
Rename variables in ff_rdt_parse_header() and callers to match the
...
comment documentation in that function. See discussion on ML in the
"[PATCH] RDT/Realmedia patches #2 " thread.
Originally committed as revision 15825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-15 02:22:47 +00:00
Jindřich Makovička
7d0842992a
check for interrupt when receiving from socket
...
Originally committed as revision 15824 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 19:33:22 +00:00
Ronald S. Bultje
9e16439287
Add comment describing the RDT packet header. See discussion in "[PATCH]
...
RDT/Realmedia patches #2 " thread on the mailinglist.
Originally committed as revision 15823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 18:37:58 +00:00
Baptiste Coudurier
eb63b051c0
timestamp is dts in wmv/asf
...
Originally committed as revision 15821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-14 03:45:31 +00:00
Jindřich Makovička
236bb1ab01
Allow the UDP socket buffer size to be adjusted using a
...
'buffer_size' URL option.
Patch by Jindrich Makovicka, makovick at gmail dot com
Originally committed as revision 15807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-12 21:40:53 +00:00
Jindřich Makovička
f5edd874fa
always use the whole buffer for reading w/ packetized sources to avoid packet truncation
...
Originally committed as revision 15799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-10 21:41:35 +00:00
Stefano Sabatini
15545a095a
Fix argument constness for the av_codec_get_id() and
...
av_codec_get_tag() functions, making them take in input a constant
array, since they're not supposed to change it. Fix some warnings.
Originally committed as revision 15795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 18:37:03 +00:00
Peter Ross
d2299316ce
Electronic Arts demuxer: support TGQ video tags
...
Originally committed as revision 15791 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-08 00:39:31 +00:00
Måns Rullgård
e3b07e1a74
OGG: correct PTS with old theora streams
...
Originally committed as revision 15785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-06 01:57:17 +00:00
Måns Rullgård
77be08eeb1
OGG: untypedef demuxer structs
...
Originally committed as revision 15784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-06 01:50:56 +00:00
Peter Ross
4fd71a0ee8
Decode audio channel layout from RIFF/WAV file format.
...
Originally committed as revision 15774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-05 09:22:13 +00:00
Michael Niedermayer
f23938f5b7
Check sub_packet_size against 0 to avoid div by zero later.
...
Fixes issue473
Originally committed as revision 15739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-29 00:16:50 +00:00
Andrew Wason
8ff8de73a4
Fix endless loop when opening corrupt FLV files (issue 699).
...
Patch by Andrew Wason, rectalogic A rectalogic D com
Originally committed as revision 15738 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-28 23:49:04 +00:00
Baptiste Coudurier
785b0f3c54
fix umid base value, use revision 5 and generic material type
...
Originally committed as revision 15723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-27 00:21:42 +00:00
Baptiste Coudurier
0df4903a07
fix sound essence compression UL
...
Originally committed as revision 15721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:59:28 +00:00
Baptiste Coudurier
1d30d1ad4d
fix start position UL
...
Originally committed as revision 15720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-26 23:57:41 +00:00
Baptiste Coudurier
7f8cd075e0
simplify sample rate code, flv_set_audio_codec already overrides it for nellymoser 8khz
...
Originally committed as revision 15687 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 23:06:03 +00:00
Diego Biurrun
f94036f159
prettyprinting cosmetics
...
Originally committed as revision 15682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:41:27 +00:00
Diego Biurrun
75f2c20983
spelling cosmetics
...
Originally committed as revision 15681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:37:06 +00:00
Baptiste Coudurier
f96d0eef53
force sample rate to 16khz for speex in flv, fix speexaudio.flv
...
Originally committed as revision 15678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 18:36:26 +00:00
Pascal Massimino
4fe8a45240
fix for >2GB flv files
...
Originally committed as revision 15677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 16:46:43 +00:00
Baptiste Coudurier
bd09e8a7df
raw dnxhd de/muxer
...
Originally committed as revision 15674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 01:42:57 +00:00
Baptiste Coudurier
b774fdd7a4
dnxhd codec is intra only
...
Originally committed as revision 15672 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-23 17:30:36 +00:00
Aurelien Jacobs
abce34d979
matroskaenc: require global header
...
fixes issue696
Originally committed as revision 15667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-22 21:14:42 +00:00
Aurelien Jacobs
37d3e0667a
uses FF_ARRAY_ELEMS() where appropriate
...
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Michael Niedermayer
9806f846c0
Check for pts==dts on I/P frames in the presence of non low delay decoding and
...
discard these invalid timestamps.
fixes issue171.
Originally committed as revision 15641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-19 01:02:48 +00:00
Michael Niedermayer
f781f748b9
Move code setting delay and presentation_delayed a little up so
...
that the variables are available sooner.
Originally committed as revision 15640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 22:41:21 +00:00
Michael Niedermayer
4589dc5c4d
Append read data onto the buffer instead of overwriting, this ensures
...
that the whole buffer is available for seeking back.
Fixes issue480
Originally committed as revision 15634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 17:30:37 +00:00
Alexander Wichers
8ddd280d2d
Nellymoser 8KHZ flv muxing fix, patch by Alexander Wichers development at wichersdot nu
...
Originally committed as revision 15633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:10:08 +00:00
Alexander Wichers
88cb61bb0c
8HZ -> 8KHZ, cosmetics patch by Alexander Wichers development at wichersdot nu
...
Originally committed as revision 15632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 12:08:55 +00:00
Michael Niedermayer
bf9067cf3e
Assume mono if no other information for raw.
...
Should fix issue687
Originally committed as revision 15631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 10:40:31 +00:00
Ramiro Polla
bc574408dc
Only special-case absolute DOS paths on systems that support them.
...
Originally committed as revision 15594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-10 16:59:37 +00:00
Michael Niedermayer
51f4155fef
Make gcc 2.95 happy.
...
Originally committed as revision 15589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-08 20:55:22 +00:00
Roman Shaposhnik
4e92dabf60
replacing frame_rate and frame_rate_base with an AVRational time_base
...
Originally committed as revision 15584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 16:59:18 +00:00
Roman Shaposhnik
a53621fca8
simplifying code as per Michael's suggestion
...
Originally committed as revision 15583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 16:14:33 +00:00
Roman Shaposhnik
c9b0b38f45
simplifying the code as per Michael's suggestion
...
Originally committed as revision 15577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-07 15:49:45 +00:00
Baptiste Coudurier
5b9ce252a9
10l, fix amrwb sample rate
...
Originally committed as revision 15562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 23:30:35 +00:00
Aurelien Jacobs
b7f4e76d3d
matroskaenc: correct muxing of ASS packets
...
- split packets to store one ASS event line per Matroska block
- reformat ASS events to Matroska modified format
- extract display duration for ASS events to store as Matroska block duration
Originally committed as revision 15561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:57:56 +00:00
Aurelien Jacobs
291902c274
matroskaenc: use correct EBML ID for block duration
...
Originally committed as revision 15560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:47:10 +00:00
Aurelien Jacobs
1bfbe8ff9d
matroskaenc: pass the packet size directly as parameter of mkv_blockgroup_size()
...
Originally committed as revision 15559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:44:50 +00:00
Aurelien Jacobs
8401c51407
matroskaenc: remove useless mkv_block_size() function
...
Originally committed as revision 15558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:41:58 +00:00
Michael Niedermayer
7ccc636f03
Favor even chunk sizes in ambiguous cases.
...
Fixes transcode_069_produces_uneven_chunk_size.avi.
Originally committed as revision 15557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 22:26:43 +00:00
Michael Niedermayer
f080a7bd90
Factorize stream id parsing.
...
Originally committed as revision 15556 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 21:57:01 +00:00
Reimar Döffinger
6bc03a695b
Make size variables in dyn_buf_write unsigned so gcc will not optimize the
...
check away (due to assuming signed overflows do not happen).
Originally committed as revision 15555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 21:11:58 +00:00
Diego Biurrun
95137bbbb4
Fix 'make checkheaders', based on a patch by Diego Pettenò, flameeyes gmail com.
...
Originally committed as revision 15552 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 11:20:02 +00:00
Ronald S. Bultje
5c918b2775
Reindent after r15544.
...
Originally committed as revision 15545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:19:46 +00:00
Ronald S. Bultje
accc248f28
Implement RDTDemuxContext, which contains RDT-specific data (similar to
...
RTPDemuxContext for RTP) for these streams where the transport protocol
is RDT (as served by Realmedia servers).
Originally committed as revision 15544 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:19:15 +00:00
Ronald S. Bultje
5465b0d474
Make RTPDemuxContext opaque in rtsp.c, renaming it to tx_ctx (tx=transport)
...
and making its type a void pointer. See discussion in "RDT/Realmedia patches
#2 " thread on ML.
Originally committed as revision 15543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:17:59 +00:00
Ronald S. Bultje
99a1d1915e
Remove access into RTPDemuxContext in rtsp.c, which allows making it opaque
...
(and thus preparing for the introduction of RDTDemuxContext) in a next patch.
See discussion in "RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:16:44 +00:00
Ronald S. Bultje
9b932b8ac0
Change function prototype of RTPDynamicPayloadHandler.parse_packet() to
...
not use RTPDemuxContext, but rather take a pointer to the payload context
directly. This allows using payload handlers regardless over the transport
over which they were sent, and prepares for the introduction of a future
RDTDemuxContext. See discussion in "RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:15:06 +00:00
Ronald S. Bultje
ed0aacc76e
Rename RTP payload contexts to PayloadContext, suggested by Luca in
...
"RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-04 04:11:12 +00:00
Baptiste Coudurier
f06188d5ee
set sample rate for amr to allow stream copy since no decoder is present,
...
3gp does not store sample rate in stsd in fact. Fixes #674 .
Originally committed as revision 15536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 19:37:41 +00:00
Diego Biurrun
bc5c918ea8
Remove offset_t typedef and use int64_t directly instead.
...
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.
Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
Aurelien Jacobs
c58e8bd3c3
matroskadec: cosmetics: indentation
...
Originally committed as revision 15529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 21:15:48 +00:00
Aurelien Jacobs
21a115d17b
matroskadec: don't merge packets which have no timestamp
...
Originally committed as revision 15528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 21:14:56 +00:00
Diego Pettenò
72ab9d7f60
Use __typeof__ instead of GCC-specific typeof keyword.
...
The typeof keyword is disabled by default when building with -std=c99
as it's a GNU extension.
ICC supports the __typeof__ keyword as well as typeof.
Patch by Diego 'Flameeyes' Pettenò %flameeyes A gmail P com%
Originally committed as revision 15527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 20:01:13 +00:00
Ramiro Polla
3defa81fc4
MinGW runtime 3.15 has a wrapper for usleep().
...
Originally committed as revision 15522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 17:43:27 +00:00
Diego Biurrun
910f02a054
spelling cosmetics
...
Originally committed as revision 15518 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:28:58 +00:00
Diego Pettenò
fb65d2ca84
Use enum typers instead of int.
...
Patch by Diego 'Flameeyes' Pettenò: flameeyes gmail
Originally committed as revision 15517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 16:03:00 +00:00
Reimar Döffinger
9b5ede5b64
Add (additional) const to many global tables.
...
Originally committed as revision 15515 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-02 15:52:04 +00:00
David Conrad
a0ce2d1bbc
Cosmetics: indentation
...
Originally committed as revision 15501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 14:44:30 +00:00
David Conrad
277e3e534b
Visible width/height fields were added in Theora 3.2
...
Originally committed as revision 15500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 14:43:08 +00:00
Ronald S. Bultje
3ff2a06228
Use parse_packet vfunc in RTPDynamicProtocolHandler instead of hardcoding
...
the use of rdt_parse_packet(). See "RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 12:38:41 +00:00
Ronald S. Bultje
985b05d3c9
This patch refactors RDT packet header parsing so that it can be used in
...
rtsp.c to detect the ID of the packet source also in case of TCP streams.
This allows proper playback of RDT streams with multiple stream types, e.g.
audio + video. Accepted by LucaB in "RDT/Realmedia patches #2 " thread on ML.
Originally committed as revision 15496 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-01 12:37:07 +00:00
Ronald S. Bultje
f5f1e97f33
Reindent after previous patches.
...
Originally committed as revision 15485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:27:19 +00:00
Ronald S. Bultje
119b466811
Implement a RTSPTransport field, which allows proper separation of server
...
types and their non-standard extensions, and the data they serve. Practically,
this patch allows Real servers to serve normal non-RDT (standard RTP) data.
See discussion on ML in "Realmedia patch" thread.
Originally committed as revision 15484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:26:20 +00:00
Ronald S. Bultje
ab63fb0360
Remove access to rdt_data struct in functions called outside of the
...
DynamicProtocol* context. Doing so could lead to problems if we're accessing
Real servers serving non-RDT data (or the other way around). Temporarily,
this patch adds a _subscribe2() function which will soon be removed in one
of the subsequent commits. OK'ed by Luca in "Realmedia patch" thread on ML.
Originally committed as revision 15483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:23:33 +00:00
Ronald S. Bultje
eee2cbff77
Send improper UDP SETUP request, which is what Realmedia servers expect.
...
See discussion on ML in "Realmedia patch" thread.
Originally committed as revision 15482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:20:23 +00:00
Ronald S. Bultje
90abbdba1e
Rename RTSPProtocol to RTSPLowerTransport, so that its name properly tells us
...
that it only describes the lower-level transport (TCP vs. UDP) and not the
actual data layout (e.g. RDT vs. RTP). See discussion in "Realmedia patch"
thread on ML.
Originally committed as revision 15481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 13:18:41 +00:00
Baptiste Coudurier
0c5f76f708
support negative ctts in some way, unset wrong dts
...
Originally committed as revision 15468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-30 02:44:57 +00:00
Diego Biurrun
d0feff2a5b
Uniformly define _XOPEN_SOURCE to 600.
...
The feature_tests.h header from Sun systems (Solaris/OpenSolaris) will abort
the build if _XOPEN_SOURCE is defined to 500, and C99 is requested (as well
as POSIX.1-2001), and will only accept it to be defined to 600.
inspired by a patch from Diego Pettenò, flameeyes gmail com
Originally committed as revision 15460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-29 06:22:12 +00:00
Aurelien Jacobs
d5e34dcb72
matroskadec: merge ASS events which share the same pts in the same AVPavket
...
Originally committed as revision 15455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 23:06:25 +00:00
Aurelien Jacobs
3df2be9fa7
matroskadec: ass events lines must end with a DOS style EOL
...
Originally committed as revision 15454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 23:01:07 +00:00
Aurelien Jacobs
1bb4a1a1c4
matroskadec: set duration only for CODEC_ID_TEXT subtitles
...
Originally committed as revision 15453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 22:58:53 +00:00
Aurelien Jacobs
e7d4b7431d
matroskadec: pass duration as parameter of matroska_fix_ass_packet()
...
Originally committed as revision 15452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-28 22:55:28 +00:00
Aurelien Jacobs
7a8b7634c5
assdec: don't remove CR, they are part of the spec
...
Originally committed as revision 15442 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 23:12:24 +00:00
Diego Biurrun
78cb727302
cosmetics: Break overly long lines, one grammar fix.
...
Originally committed as revision 15441 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 20:05:12 +00:00
Diego Biurrun
4f57fa8c03
spelling/wording/grammar
...
Originally committed as revision 15440 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 19:51:53 +00:00
Diego Biurrun
fff5e687a1
Move doxygen comments for av_gettime from utils.c to avformat.h.
...
Originally committed as revision 15439 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-27 17:37:22 +00:00
Michael Niedermayer
88caf34510
ASS/SSA muxer.
...
Originally committed as revision 15430 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 19:42:21 +00:00
Benjamin Larsson
2426bb960a
add ok parts to the rm demuxer for SIPRO support
...
Originally committed as revision 15426 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 12:12:25 +00:00
Benjamin Larsson
faeedbbb06
Add support for Acelp.net fourcc and codecid, remuxing wav to avi should work
...
Originally committed as revision 15425 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 10:59:42 +00:00
Michael Niedermayer
5c8a1d1927
Do not lose the '\n'.
...
Originally committed as revision 15424 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 03:24:05 +00:00
Michael Niedermayer
de3ae185a4
2 in 1, an ASS and SSA demuxer.
...
Tested with -scodec copy on all ASS & SSA samples that i found on mphq (exactly 2).
Originally committed as revision 15422 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:19:21 +00:00
Baptiste Coudurier
6ad1c9c992
only include sys/select.h if present, fix mingw compilation
...
Originally committed as revision 15420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:12:37 +00:00
Michael Niedermayer
644b0c4c92
Prevent image2 from complaining about non monotone timestamps as
...
there are no timestamps in "raw" image2.
Originally committed as revision 15419 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-26 02:07:56 +00:00
Baptiste Coudurier
fe28178303
cosmetics, remove GXF: in log messages since it is present in context
...
Originally committed as revision 15409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 23:40:55 +00:00
Baptiste Coudurier
99f296b304
skip invalid audio samples in gxf packets
...
Originally committed as revision 15408 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 23:31:04 +00:00
Baptiste Coudurier
c75a0cce5b
include sys/select.h to get select, according to posix 2001,
...
fix compilation on freebsd 5.5
Originally committed as revision 15406 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 22:11:53 +00:00
Baptiste Coudurier
933bd8e291
include sys/select.h instead of unistd.h to get select,
...
according to posix 2001, fix compilation on freebsd 5.5
Originally committed as revision 15405 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 22:08:50 +00:00
Baptiste Coudurier
4e240985d8
stop parsing if tag size is wrongly < 8 to avoid infinite loop
...
Originally committed as revision 15401 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 18:55:00 +00:00
Michael Niedermayer
f2d65a6c8a
Avoid segfault due to not set AVCodec.
...
Originally committed as revision 15400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 17:46:23 +00:00
Baptiste Coudurier
aeb627888d
merge amr wb case with amr nb and qcelp
...
Originally committed as revision 15399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 17:17:11 +00:00
Baptiste Coudurier
26f5e1469f
do not override sample rate for amr nor qcelp, should fix some qcelp files at 16000hz
...
Originally committed as revision 15397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 17:09:59 +00:00
Michael Niedermayer
f26be47740
ASF stands for "advanced stream format" not "adaptive ...", changing it to "ASF".
...
Originally committed as revision 15395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-24 12:03:25 +00:00
Vitor Sessak
b93dd8383a
Add support for RVTR fourCC
...
Originally committed as revision 15386 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-23 06:24:00 +00:00
Michael Niedermayer
0354ddb71c
Ensure that muxer and encoder aspect ratios match. So no
...
invalid files are generated.
Originally committed as revision 15367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-19 12:37:38 +00:00
Kostya Shishkov
b30cb420cf
Add fourcc for MS RLE4
...
Originally committed as revision 15357 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-18 05:25:29 +00:00
Baptiste Coudurier
5813a29eb1
revert r14983, value is not sample aspect ratio, it is display aspect ratio
...
Originally committed as revision 15352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-17 23:14:48 +00:00
Justin Ruggles
e1a12934c5
write number of samples in FLAC extradata.
...
based on a patch by Mathieu Velten (matmaul gmail com).
Originally committed as revision 15324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 20:00:36 +00:00
Justin Ruggles
5165651cf9
add error message for unsupported codecs in WAVE.
...
Resolves issue 623.
Originally committed as revision 15322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 17:29:34 +00:00
Ronald S. Bultje
2834c365d2
Reindent after r15317.
...
Originally committed as revision 15318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 13:56:12 +00:00
Ronald S. Bultje
2e889ae4b9
Rename RTSP_SERVER_RDT to RTSP_SERVER_REAL, because RDT (the transport
...
protocol) is not strictly related to the server type (Real servers can
stream both RDT and RTP).
Originally committed as revision 15317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 13:55:21 +00:00
Aurelien Jacobs
a8fd7e764a
matroskadec: simplify, first_timecode is already in the index
...
no need to duplicate it
Originally committed as revision 15302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-12 00:06:06 +00:00
Aurelien Jacobs
5358a81f9c
matroskadec: prevent seeking before the first keyframe of the reference stream
...
Originally committed as revision 15301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 22:42:17 +00:00
Ronald S. Bultje
a6789dca1b
Reindent after r15927, see discussion in "[PATCH] rtsp cleanup part 1:
...
remove duplicate code" thread on ML.
Originally committed as revision 15298 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 17:43:44 +00:00
Ronald S. Bultje
ee0cb67fa3
Factorize out common code for opening of the RTP parsing context between
...
SDP and RTSP into a new function. See discussion on ML in "[PATCH] rtsp
cleanup part 1: remove duplicate code" thread.
Originally committed as revision 15297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-11 17:43:04 +00:00
Michael Niedermayer
e7f656d5fa
Clarify convergence_duration.
...
Originally committed as revision 15291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-10 12:51:49 +00:00
Baptiste Coudurier
00adc1e5dc
set bits_per_coded_sample according to new lavc api
...
Originally committed as revision 15289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 18:32:50 +00:00
Aurelien Jacobs
c16582579b
matroskadec: demux relevant subtitle packets after a seek
...
only works for subtitle tracks which were properly indexed up to the seek point
Originally committed as revision 15284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 12:10:25 +00:00
Aurelien Jacobs
82360e670d
matroskadec: ensure that overlapping subtitles are not added to the index
...
Originally committed as revision 15283 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 12:07:10 +00:00
Aurelien Jacobs
20f7466550
matroskadec: after seeking, skip up to the desired timestamp instead of
...
the desired stream
Originally committed as revision 15282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 12:01:51 +00:00
Aurelien Jacobs
f14a201b32
matroskadec: move timecode calculation a little earlier
...
so as to be able to use it in other part of the code
Originally committed as revision 15281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 11:54:35 +00:00
Aurelien Jacobs
3fc9d7cec4
matroskadec: sanitize track time_scale before using it
...
fix issue628
Originally committed as revision 15280 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 11:23:48 +00:00
Baptiste Coudurier
66ec3d56a2
print stream index in decimal not in hex, easier for debugging
...
Originally committed as revision 15279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-09 02:56:13 +00:00
Baptiste Coudurier
bf912a482b
set block align in av_write_header if not set, fix issue #489
...
Originally committed as revision 15277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 19:37:22 +00:00
Baptiste Coudurier
bed4fc54c9
write copyright metadata tag
...
Originally committed as revision 15276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 19:11:53 +00:00
Luca Abeni
dd1c8f3e6e
Bump Major version, this commit is almost just renaming bits_per_sample to
...
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
Originally committed as revision 15262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 14:24:59 +00:00
Baptiste Coudurier
1993f8d640
terminate tag tables by CODEC_ID_NONE
...
Originally committed as revision 15259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 00:58:24 +00:00
Baptiste Coudurier
24b8aa84d0
set default bps to 16 in wav header
...
Originally committed as revision 15239 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 04:17:15 +00:00
Ronald S. Bultje
4fce284c08
Implement RDT-specific data parsing routines. After these changes, simple
...
playback of RTSP/RDT streams should work. See discussion in "Realmedia patch"
thread on ML.
Originally committed as revision 15237 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:25:47 +00:00
Ronald S. Bultje
99b2ac0797
Reindent after previous patch.
...
Originally committed as revision 15236 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:24:01 +00:00
Ronald S. Bultje
1256d16b6c
Implement a RDT-specific SET_PARAMETER command that subscribes to the
...
first stream in a RTSP/RDT session. See discussion in "Realmedia patch"
thread on ML.
Originally committed as revision 15235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:22:18 +00:00
Ronald S. Bultje
ff13ba92fd
Add dynamic payload handlers to rdt.c. These follow the same API as the ones
...
in rtpdec.c, so that they can be shared and used in the same way in rtsp.c.
The handlers, since they are specific for RDT, are registered in rdt.c and
a new registration function is thus called from allformats.c.
The dynamic payload handler also implements RDT-specific SDP-line parsing for
OpaqueData and StartTime, which are specific for RDT and needed for proper
playback. OpaqueData contains one or a list ("MLTI") of "MDPR" chunks that
can be parsed by the rmdec.c function ff_rm_read_mdpr_codecdata(). To use
this function, we create a new rdt_demuxer, which has the same private data
as the rm_demuxer. The resulting AVFormatContext created with _open_stream()
can thus be used to call functions in the RM demuxer.
See discussion in "Realmedia patch" thread on ML.
Originally committed as revision 15234 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:21:24 +00:00
Ronald S. Bultje
0369d2b045
Give register_dynamic_payload_handler() in rtpdec.c a ff_ prefix and export
...
it so that I can use it in rdt.c as well. See discussion in "Realmedia patch"
thread on ML.
Originally committed as revision 15233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 01:19:26 +00:00
Aurelien Jacobs
74cf481970
bump lavf micro version to allow checking for the matroska/ASS bugfix in r15211
...
Originally committed as revision 15232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-07 00:05:30 +00:00
Aurelien Jacobs
a3467f8608
matroskadec: remove now useless vstream and is_video_key_frame
...
Originally committed as revision 15231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:44:29 +00:00
Aurelien Jacobs
dbfb0e5f36
matroskadec: remove useless braces
...
Originally committed as revision 15230 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:43:24 +00:00
Aurelien Jacobs
24c3da1637
matroskadec: ensure that the timecode added to the index are is the one
...
of the actual keyframe block, and not the one of the start of the cluster
containing this block.
Originally committed as revision 15229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-06 23:39:59 +00:00
Baptiste Coudurier
cf74dd4a5c
do not fail if audio is uncompressed and frame size is not set, just set it
...
Originally committed as revision 15216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:30:27 +00:00
Baptiste Coudurier
235a51ad31
simplify bps code by using av_get_bits_per_sample
...
Originally committed as revision 15215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-05 02:20:33 +00:00
Aurelien Jacobs
3eb9bfbb84
matroskadec: fix ASS subtitle track packets before emitting them
...
Matroska does some butchering when storing the ASS lines. The start and end
time are removed (because they are duplicated in the container).
The matroska_fix_ass_packet() function simply restore those start and end
time in ASS lines to ensure our ASS packets comply with the ASS spec.
Originally committed as revision 15211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:26:12 +00:00
Baptiste Coudurier
52cf395407
Fix msgsm in wav, do not set blkalign to frame size, this is wrong,
...
all samples have correct blkalign set to 65
Originally committed as revision 15209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:19:53 +00:00
Aurelien Jacobs
62c24705c8
matroska: subtitle display duration must be stored in pkt->convergence_duration
...
Originally committed as revision 15206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 23:08:19 +00:00
Baptiste Coudurier
5d79f30d70
set block align and frame size for gsm in aiff
...
Originally committed as revision 15203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 22:35:05 +00:00
Baptiste Coudurier
efa1fb39d2
cosmetics, remove whitespace
...
Originally committed as revision 15198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:26:31 +00:00
Kurtnoise
4ed1942008
actually write dac3 atom, patch by Kurtnoise, kurtnoise at free dot fr
...
Originally committed as revision 15197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:25:55 +00:00
Damiano Galassi
544a0f47af
skip 2 bytes more when parsing ac3 frame, syncword 16bits + crc 16bits,
...
patch by Damiano Galassi, damiog at gmail dot com
Originally committed as revision 15196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-04 18:17:21 +00:00
Baptiste Coudurier
c4e02d702c
change the logic to mux 13818-3 and 11172-3 in mp4, less code
...
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:42:09 +00:00
Baptiste Coudurier
e00c3de821
forbid mp3 < 16000hz in anything except mov
...
Originally committed as revision 15189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:31:03 +00:00
Baptiste Coudurier
c3b1325158
dirac muxing support in mp4/mov
...
Originally committed as revision 15188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:23:24 +00:00
Baptiste Coudurier
5180b027cc
cosmetics, move up mpeg1video mp4 objecttype
...
Originally committed as revision 15187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:18:49 +00:00
Baptiste Coudurier
2f980d2a83
cosmetics, change values to hex since mp4ra use hex
...
Originally committed as revision 15186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:17:28 +00:00
Baptiste Coudurier
baa0be4cf0
cosmetics, vertical align
...
Originally committed as revision 15185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:08:56 +00:00
Baptiste Coudurier
d4a240cbc9
ac3 muxing support in mov/mp4/m4v
...
Originally committed as revision 15184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 19:05:22 +00:00
Reimar Döffinger
dc76fe1348
Change doxygen comment: Clarify when av_write_trailer should be called.
...
Originally committed as revision 15181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 17:57:56 +00:00
Michael Niedermayer
a2636c0fd5
Add AVPacket.convergence_duration.
...
Originally committed as revision 15179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 14:44:54 +00:00
Michael Niedermayer
a82630deb2
Try to clarify the semantics of AVPacket.duration.
...
Originally committed as revision 15178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 14:02:17 +00:00
Ronald S. Bultje
0ad306bc81
Remove unused code that used to handle protocol concatenation, i.e. trying
...
multiple protocols at the same time. We now cycle protocols individually
to autodetect, making this code no longer needed, and thus the support code
for it in make_setup_request() can be removed. See "[PATCH] remove transport
concatenation dead code" on mailinglist.
Originally committed as revision 15172 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 04:47:44 +00:00
Ronald S. Bultje
e9dea59f16
Implement Realmedia/RTSP-compatible SETUP command. This includes calculation
...
of the "RealChallenge2" response, which is some sort of authentication. See
discussion in "Realmedia patch" thread on ffmpeg-devel.
Originally committed as revision 15170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 04:44:58 +00:00
Baptiste Coudurier
bea6c1ec80
fix fourcc comment
...
Originally committed as revision 15169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 01:42:26 +00:00
Ronald S. Bultje
1599503043
Move av_set_pts_info() inside the mdpr_read_codecdata() call, so that it is
...
shared between the RM demuxer and the RTSP/RDT parser; both use the same
timebase. See discussion in "[PATCH] rmdec.c: move av_set_pts_info()" on ML.
Originally committed as revision 15164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 00:07:34 +00:00
Ronald S. Bultje
79d5045d33
Use chunk-size in function calling mdpr_read_codecdata() rather than in the
...
function itself. This way, old-style (.ra4) RTSP/RDT OpaqueData chunks can
be parsed using this function as well (they don't have the size bits). See
discussion on ML in "[PATCH] rmdec.c - small read_mdpr_codecdata() API
modification".
Originally committed as revision 15163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-03 00:05:55 +00:00
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