virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
22,824 Commits 37 Branches 400 Tags 465 MiB
30ff7c5cbc
Commit Graph

5674 Commits

Author SHA1 Message Date
Martin Storsjö
30ff7c5cbc Only send out NAT-punching RTP/RTCP packets when we're in demuxer mode, i.e. 
don't send them when acting as a RTSP muxer.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21913 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 23:13:21 +00:00
Martin Storsjö
69adcc4ffb Use mode=receive instead of mode=play if in RTSP muxer (instead of demuxer) 
mode.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21912 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 23:11:59 +00:00
Martin Storsjö
52aa4338cc Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState 
argument, so we can use AVFormatContext->* here in the future.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21911 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 23:10:19 +00:00
Kostya Shishkov
ce8f750c29 WavPack demuxer also depends on APE tag parser 
Originally committed as revision 21909 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 22:13:19 +00:00
Kostya Shishkov
8cdfa4747b Make Bink demuxer skip all zero audio tracks, not only the first one 
Originally committed as revision 21908 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 22:10:04 +00:00
Daniel Verkamp
df17dbf73c AEA demuxer requires raw.o for pcm_read_seek 
Originally committed as revision 21905 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 21:12:46 +00:00
Vitor Sessak
cdfc38f43b Fix memory leak for truncated frames 
Originally committed as revision 21901 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 20:20:17 +00:00
Vitor Sessak
df2235a165 Fix memory leak for truncated frames 
Originally committed as revision 21900 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 20:19:41 +00:00
Martin Storsjö
251f050481 Remove stale function declaration. 
Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21899 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 17:26:33 +00:00
Martin Storsjö
c02fd3d2e8 Rename RTSP_STATE_PLAYING to _STREAMING, since that better covers the 
future use of the rtsp* codebase for RTSP muxing.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21896 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 16:26:21 +00:00
Kostya Shishkov
f4f2160880 WavPack demuxer supports ID3v1 tags, so don't forget id3v1.o dependency for it 
in Makefile

Originally committed as revision 21891 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 06:59:47 +00:00
Kostya Shishkov
bf7c17192f Make RTMP client send bytes read report 
Originally committed as revision 21882 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 16:27:18 +00:00
Martin Storsjö
dfd017bf0a Add functions to send RTSP commands with content attached to them. This will 
be used eventually in the RTSP muxer (see thread "[PATCH] RTSP muxer, round
3" on mailinglist).

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21862 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 19:24:02 +00:00
Ronald S. Bultje
fc78b0cb7e Remove first_rtcp_ntp_time. This is used to prevent overflow of the timestamp, 
but doesn't actually do that. What's worse, it creates timestamp adjustments
that are different per stream within a session, leading to a/v sync issues.

See discussion in thread "[FFmpeg-devel] rtp streaming x264+audio issues (and
some ideas to fix them)". Patch suggested by Luca Abeni <lucabe72 email it>.

Originally committed as revision 21857 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 23:00:03 +00:00
Martin Storsjö
9c8fa20d7e When using RTP-over-UDP, send dummy packets during stream setup, similar to 
what e.g. RealPlayer does. This allows proper port forwarding setup in NAT-
based environments.

Patch by Martin Storsjö <$firstname at $firstname dot st>.

Originally committed as revision 21856 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 22:50:50 +00:00
Ronald S. Bultje
a636b58ce1 Fix two problems (no idea how this ever worked): 
- the return value of url_open_dyn_*buf() is 0 on success, so using
   if (!(res = url_open_dyn_*buf())) return res; is not going to work
- url_open_dyn_packet_buf actually writes the max_packet_size before
   each piece of data. Feeding this to the ASF demuxer will never work.
   Therefore, use url_open_dyn_buf() instead.

Originally committed as revision 21853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 19:26:49 +00:00
Ronald S. Bultje
4abd85141c Revert r21851. 
Originally committed as revision 21852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 18:25:05 +00:00
Ronald S. Bultje
298d2fd304 Don't return 0 if buffer setup failed. That signals the RTSP demuxer that 
the packet was filled in, leading to virtually random behaviour in the
decoder later on. Instead, return a negative value.

Originally committed as revision 21851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 18:19:28 +00:00
Anton Khirnov
ed7694d8cf Set lavf identification string globally in av_write_header(), rather 
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 16:32:25 +00:00
Peter Ross
899605f150 Support IFF ANNO (annotation) chunk type 
Originally committed as revision 21847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 09:55:56 +00:00
Anton Khirnov
83a6c1a69c Strings in extended content header are UTF16, 
so terminating NULLs are 2 bytes long, not 1.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 21:19:40 +00:00
Anton Khirnov
4a3104a96a workaround for broken files created by previous versions of asfenc. 
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 21:14:47 +00:00
Reimar Döffinger
4130f7393b Reindent 
Originally committed as revision 21824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 19:00:36 +00:00
Reimar Döffinger
3adcfbbeb5 Optimize h261_probe function, since it is far slower than all others. 
About 5 times faster.

Originally committed as revision 21823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 18:59:56 +00:00
Ben Littler
4bf2b9e8f3 add netspeak gsm and truespeech wav format tags to riff.c 
Originally committed as revision 21797 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 17:57:24 +00:00
Måns Rullgård
f2a4f12cb6 Do not call lseek() with invalid whence value 
Originally committed as revision 21795 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 16:56:37 +00:00
Michael Niedermayer
ab5a0175f5 Add flag so muxers not needing width/height can signal this. 
Add this flag to img2 (fixes -vcodec copy to image2 in some cases)

Originally committed as revision 21773 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 20:35:29 +00:00
Peter Ross
cbd3441eec Make DeluxePaint Animation demuxer actually return the find_record() error code (issue 1739). 
Originally committed as revision 21769 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 11:31:35 +00:00
Michael Niedermayer
86d58bcfd9 Add GEOV fourcc (issue971). 
Originally committed as revision 21768 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 01:37:53 +00:00
Michael Niedermayer
f2d56513d7 Fix timestamps. 
Originally committed as revision 21761 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 22:32:46 +00:00
Daniel Verkamp
f45a27dc52 Reindent 
Originally committed as revision 21747 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 20:27:53 +00:00
Daniel Verkamp
b7e0f88f2b Fix demuxing of wav files with broken data header 
Originally committed as revision 21746 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 20:26:47 +00:00
Reimar Döffinger
f0cb55af88 Use av_compare_ts from libavutil instead of the locale compare_ts, the 
calculations in the later one are not correct with large time stamps.

Originally committed as revision 21744 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 19:43:57 +00:00
Timo Teräs
4e8052ddad Fix syncronisation for streams with a high encoding delay. 
Patch by Timo Teräs (timo DOT teras AT iki DOT fi)

Originally committed as revision 21743 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 19:33:08 +00:00
Ronald S. Bultje
7515ed0c1d Reindent after r21741. 
Originally committed as revision 21742 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 18:31:47 +00:00
Ronald S. Bultje
170870b77c Don't forget to set known audio parameters (samplerate, etc.) if the codec is 
not supported in FFmpeg. This will cause crashes later because the samplerate
is used to initialize the timebase.

Originally committed as revision 21741 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 18:30:55 +00:00
Ronald S. Bultje
556aa7a102 RTP/AMR depacketizer, by Martin Storsjö <$firstname at $firstname dot st>. 
Originally committed as revision 21740 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 17:20:50 +00:00
Michael Niedermayer
0332324a48 Dont give up after 100kb of zero bytes but returnd EAGAIN 
fixes issue1729

Originally committed as revision 21738 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 14:25:57 +00:00
Andreas Öman
80242f9bdb mp3: ftell() file offset for VBR tags before ID3v1 parser messes it up. 
Originally committed as revision 21737 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 12:44:16 +00:00
Stefano Sabatini
fe4fbb583d Doxument url_fopen(). 
Originally committed as revision 21714 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 18:59:34 +00:00
Reimar Döffinger
be4a113264 Make sure the header value used to avoid repeating headers on seeking to the 
start and to avoid initializing codecs with missing headers is set for all streams.
Fixes issue 1723.

Originally committed as revision 21693 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 20:25:36 +00:00
Ronald S. Bultje
04a2b04b98 Implement gai_strerror() for systems lacking such functionality. Patch 
by KO Myung-Hun <komh challion net>.

Originally committed as revision 21692 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 18:48:12 +00:00
David Conrad
ecc0027bc6 Fix playback with invalid files that don't set the continuation flag for 
pages that continue packets started in prior pages.
Fixes issue1248

Originally committed as revision 21688 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 10:13:03 +00:00
Michael Niedermayer
e6406939a8 Directly use av_rescale_rnd() instead of av_convert_ts() as this cuts the 
number of calls to it down by 2.

Originally committed as revision 21676 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-07 19:10:04 +00:00
Michael Niedermayer
e5026c36d4 Use av_compare_ts() for interleaving per dts. 
Originally committed as revision 21672 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-07 16:27:17 +00:00
Michele Orrù
084eb95fd5 Implement a physical concatenation protocol. 
Patch by Michele Orrù reverse(<moc.liamg@yp.rekam>).

Originally committed as revision 21666 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-07 10:25:58 +00:00
Anton Khirnov
04d2540c4b Add AVI metadata conversion table. 
Patch by Anton Khirnov (gmail{wyskas}).

Originally committed as revision 21653 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-06 12:32:44 +00:00
Stefano Sabatini
4e38c09433 Doxument url_fdopen(). 
Originally committed as revision 21647 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-05 23:03:32 +00:00
Michael Niedermayer
ffdf0d48fc strn muxing in avi support. 
untested as ffmpeg.c has no means to set AVStream metadata (patchwelcome)

Originally committed as revision 21644 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-05 15:14:56 +00:00
Michael Niedermayer
7a9af8ec19 Support strn tag in avidec. 
Originally committed as revision 21643 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-05 12:16:59 +00:00