generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
27,437 Commits 24 Branches 241 Tags 173 MiB
9653e754a4
Commit Graph

6848 Commits

Author SHA1 Message Date
Reimar Döffinger
326851b9bc Add muxer for IVF format. 2011-01-17 21:11:51 +01:00
John Wimer
b79c3df088 prevent integer overflow in calculating duration 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-01-17 17:05:58 +02:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files 
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
 2011-01-17 15:50:14 +01:00
Michael Niedermayer
8bb7d97be0 Check 4xm headers for validity. This should avoid 1/0. 
Originally committed as revision 26392 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-16 18:22:29 +00:00
Michael Niedermayer
f9329946d0 Parse fact chunks from wav files to find duration. 
Originally committed as revision 26370 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 17:13:32 +00:00
Michael Niedermayer
724b1f6a05 Factor tag reading code out of wav read_header() 
Originally committed as revision 26369 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 17:13:30 +00:00
Michael Niedermayer
462b26202b Set duration for wav files from sample size and data size or the wf64 sample value. 
This should improve duration accuracy slightly and avoids a warning about its
inaccuracy when accurate values are available. Idea by Frank Barchard

Originally committed as revision 26366 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-15 16:26:42 +00:00
Baptiste Coudurier
6dc7dc08ed In mxf muxer, check the return value of gmtime, fix #2494 
Originally committed as revision 26343 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 22:36:23 +00:00
Ronald S. Bultje
06ed024d4f Copy metadata from ASF files contained in RTSP streams from ASF to RTSP layer, 
so that applications can read it also.

Originally committed as revision 26332 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 19:44:44 +00:00
Ronald S. Bultje
7f88a5bf9b Introduce av_metadata_copy() to copy metadata from one struct to another. 
Originally committed as revision 26330 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 19:30:55 +00:00
Peter Ross
b070bcfe8a wtv: ignore VIDEOINFOHEADER2 picture aspect ratio information, as it is unreliable 
Originally committed as revision 26327 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-14 08:28:27 +00:00
Martin Storsjö
c66f53cf8b Revert aviobuf: Retry if the read/write function returns AVERROR(EAGAIN) 
This reverts SVN commit 26318, which broke MS-RTSP playback.

Originally committed as revision 26326 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-13 06:22:43 +00:00
Stefano Sabatini
0d3ee13551 Use AVERROR_INVALIDDATA rather than -1 for nutdec error codes. 
Originally committed as revision 26321 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-12 16:40:28 +00:00
Martin Storsjö
a6963f8304 aviobuf: Retry if the read/write function returns AVERROR(EAGAIN) 
Originally committed as revision 26318 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-12 07:06:27 +00:00
Baptiste Coudurier
c3024f9e7e In mov demuxer, handle better wrong time scale, fix issue #2528 
Originally committed as revision 26311 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 21:06:37 +00:00
Baptiste Coudurier
f6253caf8b In mov demuxer, set r_frame_rate for cfr files 
Originally committed as revision 26310 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 19:58:00 +00:00
Daniel Kang
e048a9cab1 Do not crash for illegal sample size, fixes issue 2502. 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26309 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 14:08:45 +00:00
Stefano Sabatini
440d761e40 Clarify timestamps related error messages in compute_pkt_fields2(). 
Originally committed as revision 26308 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 12:17:27 +00:00
Peter Ross
1c4ac03530 electronicarts: prevent endless loop opportunity in process_audio_header_elements() 
Fixes issue2529.

Originally committed as revision 26307 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-11 02:25:12 +00:00
Peter Ross
74093bb593 revert r26302 
Originally committed as revision 26305 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 22:25:45 +00:00
Peter Ross
e19e051e56 electronicarts: prevent endless loop opportunity in process_audio_header_elements() 
Fixes issue2529.

Originally committed as revision 26302 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 12:56:50 +00:00
Peter Ross
42396c2e67 electronicarts: only apply audio sanity checks when audio stream is present 
Originally committed as revision 26301 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 12:51:45 +00:00
Daniel Kang
cb77dad724 perform sanity check on sample rate in electronicarts demuxer 
Fixes issue2525
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26298 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 11:38:38 +00:00
Daniel Kang
4da766ce65 perform sanity check on number of channels in electronicarts demuxer 
Fixes issue2514
Original patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26296 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-10 11:02:07 +00:00
Martin Storsjö
a3b058b7ba rtsp: Properly fail if unable to open an input RTP port 
Originally committed as revision 26285 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 10:47:53 +00:00
Peter Ross
5a477e5960 fix indentation 
Originally committed as revision 26278 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:44:54 +00:00
Peter Ross
866009ea19 wtv: only process timestamp_guid chunks for streams that we know about 
Originally committed as revision 26277 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:42:16 +00:00
Peter Ross
a5a36a7970 wtv: do not repopulate codec information after we have seen data chunks 
Originally committed as revision 26276 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:35:06 +00:00
Peter Ross
bf2e54174e wtv: stop processing chunks if length is smaller than chunk header 
Originally committed as revision 26275 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:21:30 +00:00
Peter Ross
9372f31e03 wtv: fix typo 
Originally committed as revision 26274 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:13:58 +00:00
Peter Ross
50d83b2005 Add audio codec 0x1602 (AAC LATM) 
Originally committed as revision 26273 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-09 02:11:41 +00:00
Carl Eugen Hoyos
d267b339e4 Lagarith decoder by Nathan Caldwell, saintdev at gmail 
Originally committed as revision 26270 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-08 21:22:15 +00:00
Baptiste Coudurier
a2b7ed3274 In mov muxer, override codec tag for dv in mov, fix remuxing from avi 
Originally committed as revision 26257 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 19:56:31 +00:00
Baptiste Coudurier
10d8eac98d In mov muxer, override codec tag for h263 in mov, fix remuxing from 3gp 
Originally committed as revision 26255 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-07 19:55:08 +00:00
Martin Storsjö
a92c30d76e rtsp: Allow requesting of filtering of source packets 
If filtered, only packets from the right source address and port
are received.

To test, play back e.g. some mpeg4 video RTSP stream (where the
video stream is the first stream in the presentation) over UDP.
While receiving this stream, send another stream to the same port:
ffmpeg -re -i <whatever> -vcodec mpeg4 -an -f rtp
rtp://127.0.0.1:5000?localport=1234
Normally, the RTSP playback reports lots of errors at this point.

If the RTSP stream has the ?filter_src option enabled, these
interferring packets are ignored.

Originally committed as revision 26246 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 15:22:58 +00:00
Martin Storsjö
21a569f302 udp: Allow specifying the connect option in udp_set_remote_url, too 
If the remote address is updated later with this function, the caller
shouldn't set the connect option until in this call.

Originally committed as revision 26245 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 15:16:50 +00:00
Martin Storsjö
babd19ce2e rtpproto: Allow specifying the connect option, passed through to udp 
By calling connect on the UDP socket, only packets from the chosen
peer address and port are received on the socket. This is one
solution to issue 1688.

Originally committed as revision 26244 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 15:16:09 +00:00
Carl Eugen Hoyos
504530bfba Set blkalign to 3840 (maximum bytes per frame) for AC-3 in avi. 
Fixes playback for corner-cases like 32kHz 320kb.

Originally committed as revision 26242 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 13:30:32 +00:00
Martin Storsjö
79d482b108 rtpdec: Don't set RTP timestamps if they already are set by the depacketizer 
For MS-RTSP, we don't always get RTCP packets (never?), so the earlier
timestamping code never wrote anything into pkt->pts. The rtpdec_asf
depacketizer just sets the dts of the packet, so if the generic RTP
timestamping is used, too, we get inconsistent timestamps.

Therefore, skip the generic RTP timestamp algorithm if the depacketizer
already has set something.

This fixes "Invalid timestamps" warnings, present since SVN rev 26187.

Originally committed as revision 26241 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 11:33:06 +00:00
Daniel Kang
6cbce63650 Fix assertion fail on audio files with invalid sample rates, 
fixes issue 2475.

Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26240 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 03:30:19 +00:00
Stefano Sabatini
6bbdba08c2 Revert previous commit, as it was not meant to be pushed. 
Originally committed as revision 26239 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:11:57 +00:00
Stefano Sabatini
7820147e6f Issue more explicit error messages in compute_pkt_fields2(). 
Originally committed as revision 26238 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:01:21 +00:00
Stefano Sabatini
81bd411965 In av_close_input_stream(), flush the packet queue before to actually 
close the stream.

This way the flushed packets can still reference the still unclosed
format context.

In particular this fixes a spurious error issued when closing the
video4linux2 buffer in mmap_release_buffer(), which tries to access
the file descriptor of an already closed file.

Originally committed as revision 26237 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-06 01:01:14 +00:00
Martin Storsjö
29db7c3af4 rtsp: Parse RTP-Info headers 
Originally committed as revision 26236 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:23:42 +00:00
Martin Storsjö
4cb06874c7 Reindent 
Originally committed as revision 26235 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:23:12 +00:00
Martin Storsjö
91d96bd3c0 rtsp: Simplify code 
Originally committed as revision 26234 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:22:50 +00:00
Martin Storsjö
1726813f13 rtsp: Move resetting of rtpdec parameters to before sending the PLAY request 
Originally committed as revision 26233 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 21:22:15 +00:00
Baptiste Coudurier
ab04337464 In ogg muxer, correctly mux VFR streams, fix issue #2398 
Originally committed as revision 26229 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:32:45 +00:00
Baptiste Coudurier
5e2202d6f3 In mov demuxer, check that gmtime returns a valid value, fix crash, issue #2490 
Originally committed as revision 26228 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:21:04 +00:00
Baptiste Coudurier
4af7166fb4 In mov demuxer, check that stts data exists, fix crash, issue #2479 
Originally committed as revision 26227 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-05 19:14:44 +00:00
Anton Khirnov
14fa75eab4 lavf: rename meta.h->ffmeta.h for consistency. 
Originally committed as revision 26211 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 12:35:39 +00:00
Peter Ross
6780f48846 wtv: obtain codec information from stream2_guid chunks, if present 
Originally committed as revision 26208 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-04 11:38:29 +00:00
Peter Ross
17e33f662a wtv: display warning if scrambled stream is detected 
Originally committed as revision 26197 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 11:17:34 +00:00
Anssi Hannula
cf99e4aa00 Add AVOption support for muxers. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26195 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:52:34 +00:00
Anssi Hannula
febd72be65 Use new function put_nbyte() to speed up padding. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26194 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:46:50 +00:00
Anssi Hannula
17ee8f669f Add function put_nbyte() to speed up padding in SPDIF muxer. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26193 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:45:07 +00:00
Martin Storsjö
d2995eb910 rtsp: Store the Content-Base header value straight to the target 
This avoids having a large temporary buffer in the struct used for
storing the rtsp reply headers.

Originally committed as revision 26192 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:11:12 +00:00
Martin Storsjö
77223c5388 rtsp: Pass the method name to ff_rtsp_parse_line 
Originally committed as revision 26191 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:10:12 +00:00
Martin Storsjö
acc9ed1450 rtsp: Pass RTSPState to ff_rtsp_parse_line, instead of HTTPAuthState 
This allows ff_rtsp_parse_line to do more changes directly in RTSPState
when parsing the reply, instead of having to store large amounts of
temporary data in RTSPMessageHeader.

Originally committed as revision 26190 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:07:56 +00:00
Martin Storsjö
3df54c6bf2 rtsp: Add a method parameter to ff_rtsp_read_reply 
Originally committed as revision 26189 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 10:06:21 +00:00
Daniel Kang
7f8ffc4efd Fix a floating point exception for invalid framerate, fixes issue 2470. 
Patch by Daniel Kang, daniel.d.kang at gmail

Originally committed as revision 26188 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-02 05:01:46 +00:00
Martin Storsjö
3a1cdcc798 rtpdec: Emit timestamps for packets before the first RTCP packet, too 
Emitted timestamps in each stream start from 0, for the first received
RTP packet. Once an RTCP packet is received, that one is used for
sync, emitting timestamps that fit seamlessly into the earlier ones.

Originally committed as revision 26187 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-01 22:27:16 +00:00
Peter Ross
773d892a31 move ff_get_bmp_header under CONFIG_DEMUXERS block 
Originally committed as revision 26182 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2011-01-01 03:24:10 +00:00
Carl Eugen Hoyos
f6bf6e511d Set blkalign to maximum framesize to allow playback on WMP (see issue 2455 and issue 2446). 
Originally committed as revision 26167 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-30 14:21:14 +00:00
Carl Eugen Hoyos
548b97a66a Cosmetics: Re-indent after last commit. 
Originally committed as revision 26161 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 23:43:25 +00:00
Anssi Hannula
cc6c0c7b52 Do not add the preamble if the DTS stream is already padded, like DTS in 
wav. In that case, DTS can be transmitted through S/PDIF without
the IEC 61937 headers.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26160 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 23:42:27 +00:00
Anssi Hannula
d8e481bb86 s/IEC958/IEC 61937 - IEC958 is a lower level format. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26141 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 18:48:32 +00:00
Anssi Hannula
836132ec43 Fix wrong bitstream mode for AC-3. 
Noticed by CrystalP from XBMC.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26130 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:48:40 +00:00
Anssi Hannula
a4c8e0a82b Improve error return values. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26129 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:42:14 +00:00
Anssi Hannula
977903521e Always encapsulate DTS in big-endian format, at least some receivers 
require that.

Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26128 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:34:47 +00:00
Anssi Hannula
e5e932e8b0 Add Anssi and myself to the authors in doxygen. 
Patch by Anssi Hannula, anssi d hannula a iki d fi

Originally committed as revision 26127 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 16:30:07 +00:00
Peter Ross
3900707866 wtv: parse MPEG2 descriptor events 
Originally committed as revision 26126 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 13:41:10 +00:00
Peter Ross
cc9038e95c add ff_parse_mpeg2_descriptor; make MPEG2 descriptor parsing routines available to other modules. 
Originally committed as revision 26125 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 12:45:31 +00:00
Peter Ross
0af1671e53 wtv: only warn about unknown subtype, if it actually unknown 
Originally committed as revision 26123 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 10:43:16 +00:00
Peter Ross
945df9703b wtv: use correct names for subtitle and language guids 
Originally committed as revision 26122 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 03:49:02 +00:00
Michael Niedermayer
7cf0472e6a Fix assertion failure due to frames being 0 in mp3 vbr bitrate calculation. 
Fixes issue 2442.

Originally committed as revision 26121 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-29 01:33:36 +00:00
Anton Khirnov
bb50ed089f ffmetaenc: remove useless initializers 
Originally committed as revision 26114 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-28 09:03:38 +00:00
Anton Khirnov
645439c3c3 lavf: rename meta{dec,enc}.c -> ffmeta{dec,enc}.c 
Originally committed as revision 26113 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-28 09:03:33 +00:00
Martin Storsjö
9e99f84f7d rtsp: Check if the rtp stream actually has an RTPDemuxContext 
For example MS-RTSP doesn't have RTPDemuxContexts for all streams.

This fixes issue 2448.

Originally committed as revision 26107 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 09:56:19 +00:00
Nicolas George
9128ae08b3 Implement av_find_best_stream. 
Originally committed as revision 26104 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 09:08:20 +00:00
Anton Khirnov
107a7e3e7b lavf: bump minor and add APIchanges entry after adding AVFMT_NOSTREAMS 
Originally committed as revision 26103 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:57 +00:00
Anton Khirnov
fd5b124d74 Metadata demuxer. 
Originally committed as revision 26102 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:53 +00:00
Anton Khirnov
a46515115c Metadata muxer 
Dumps all metadata to a text file for easy manual editing.

Originally committed as revision 26101 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:49 +00:00
Anton Khirnov
bb62d5c1f0 Allow output formats without any streams. 
Required for future metadata format.

Originally committed as revision 26100 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-27 07:46:44 +00:00
Peter Ross
a187c68678 Bump libavformat minor version, forgotten in r26094 
Originally committed as revision 26095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 05:48:38 +00:00
Peter Ross
82ca054a63 Windows Televison (WTV) demuxer 
Originally committed as revision 26094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:28:25 +00:00
Peter Ross
a750050f4c make guid utility function visibile to other modules (ff_guidcmp, ff_get_guid) 
Originally committed as revision 26093 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:26:29 +00:00
Peter Ross
141de5a9c1 add ff_find_stream_index 
Originally committed as revision 26092 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:24:51 +00:00
Peter Ross
456a70aeb8 add ff_get_bmp_header 
Originally committed as revision 26091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-26 01:23:44 +00:00
Michael Niedermayer
58ec7e00db Clarify AVFMT_TS_DISCONT and muxers. 
Originally committed as revision 26089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-25 19:49:15 +00:00
Martin Storsjö
8c579c1c60 rtsp: Require the transport reply from the server to match the request 
This fixes a crash if we requested TCP interleaved transport, but the
server replies with transport data for UDP. According to the RFC, the
server isn't allowed to respond with another transport type than the
one requested.

Originally committed as revision 26077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-23 15:05:24 +00:00
Martin Storsjö
81c8c18780 Makefile: Fix dependencies of components 
This fixes compilation with --disable-everything --enable-<component>,
for all encoders, decoders, muxers, demuxers, parsers, protocols, bsfs,
indevs, outdevs and filters at the moment. (All those that work without
any external dependencies at least.)

Originally committed as revision 26076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-22 20:00:42 +00:00
Martin Storsjö
1e0957cc6b Add a missing dependency for the WebM muxer 
This fixes one of the issues found if building with
--disable-everything --enable-muxer=webm

Originally committed as revision 26066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-21 09:23:35 +00:00
Martin Storsjö
9b14ec5fae sdp: Add a framesize attribute to H.263 SDP descriptions 
While not mentioned in RFC 4629, this is required for H.263 in
3GPP TS 26.234. It is in practice required for playback with
Android stagefright and on Samsung bada phones.

Originally committed as revision 26062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-20 20:46:40 +00:00
David Czech
9100d4d632 Fix crash if invalid bit-rate was read from file. 
Fixes issue 2426.

Patch by David Czech, davidczech510 gmail

Originally committed as revision 26061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-20 09:58:27 +00:00
Reimar Döffinger
bf09a01981 Change ASF demuxer to return incomplete last packets. 
Whether the behaviour for streams using scrambling makes sense
is unclear.

Originally committed as revision 26053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-18 13:18:52 +00:00
Zhentan Feng
c4e93eeecd Increase buffer size because the header itself can be larger than 8192 
(largest size according to spec: 64k). Fixes playback of
mmsh://a1635.v24937.c2493.g.vm.akamaistream.net/7/1635/2493/v0001/premrad.download.akamai.com/2493/premiere_rock_report/Country_Report.wma

Patch by Zhentan Feng <spyfeng gmail com>.

Originally committed as revision 26047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-17 21:17:40 +00:00
Martin Storsjö
bbd8f5477d rtsp: Don't set the RTP time base from the sample rate if no sample rate is set 
This also reverts SVN rev 26016, which incorrectly overwrote the time base
with 90 kHz for all streams, regardless of what was set by the SDP parsing.

The stream that triggered the fix in 26016 still works after this commit.

Originally committed as revision 26022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 21:06:25 +00:00
Luca Barbato
a4a3bade0a Reinstate default time_base for rtp streams 
The generic default is 0/0 and that obviously triggers once the value is used.

Originally committed as revision 26016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-15 17:16:37 +00:00
Thomas Guillem
1aa58c6405 tcp: Check url_interrupt_cb if connect was interrupted by a signal 
This makes it possible to abort a blocking connect call.

Patch by Thomas Guillem, thomas dot guillem at gmail

Originally committed as revision 26014 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-12-14 23:03:05 +00:00