1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

5801 Commits

Author SHA1 Message Date
Benoit Fouet
47794b9d3e asfdec: fix a memleak.
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:32:20 +00:00
Benoit Fouet
514b73cf0d asfdec: only unicode tags must have even length.
Patch from: Anton Khirnov wyskas gmail

Originally committed as revision 22016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:31:03 +00:00
Anton Khirnov
43382b5f13 Introduce metadata conversion table for NUT muxer and demuxer.
Patch by Anton Khirnov (wyskas, do no evil mail)
Thread "[PATCH] nut metadata conversion table"

Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 06:27:12 +00:00
Michael Niedermayer
ab392695d5 Count all frames with codec_info_nb_frames not just ones with non zero
duration. I hope this breaks nothing. Its needed for my fix of issue1156

Originally committed as revision 22001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 16:29:57 +00:00
Michael Niedermayer
6c6e6ef5e2 Put codec_info_nb_frames back in AVStream and print its value.
This way streams with no or very few frames can be avoided during
auto selection

Originally committed as revision 21998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 15:07:18 +00:00
Peter Ross
02cd6f5426 Set video stream duration for Bink demuxer
Originally committed as revision 21996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:15:18 +00:00
Martin Storsjö
9399393333 Cosmetics: reindent
Originally committed as revision 21995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:05:36 +00:00
Peter Ross
b62c65f23e Bink audio pts starts at 0, not reported_size
Originally committed as revision 21994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 11:01:51 +00:00
Kostya Shishkov
a45972a806 Make Bink demuxer pass video flags to decoder
Originally committed as revision 21978 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 06:36:26 +00:00
Ronald S. Bultje
3307e6ea86 Prefix non-static RTSP functions with ff_.
Originally committed as revision 21974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 00:35:50 +00:00
Michael Niedermayer
b7884740fa Make sure mp1/mp2 get their frame_size set.
Fixes issue1696

Originally committed as revision 21972 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 22:05:20 +00:00
Martin Storsjö
6f5a3d0a7b Add an RTSP muxer
Originally committed as revision 21971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:28:19 +00:00
Martin Storsjö
f86f665623 Free metadata in chained RTP muxers in the RTSP muxer
This fixes a minor memory leak

Originally committed as revision 21970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 21:20:30 +00:00
Martin Storsjö
af037f8098 Cosmetics: reindent
Originally committed as revision 21969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:47:22 +00:00
Martin Storsjö
15ba23150e Add declarations and doxygen documentation of generic rtsp support functions
to rtsp.h, and make the functions non-static

Originally committed as revision 21968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 19:44:08 +00:00
Martin Storsjö
2efc97c2fe Cosmetics: reindent after applying patches
Originally committed as revision 21967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 16:11:38 +00:00
Martin Storsjö
35cfd6464e Don't follow RTSP redirects when used as a muxer
Originally committed as revision 21966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:57:40 +00:00
Martin Storsjö
3e24c7701c Add a function rtsp_setup_output_streams for announcing the SDP
and setting up the internal RTSPStream data structures when using
the RTSP code in muxer mode.

Originally committed as revision 21965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:56:18 +00:00
Martin Storsjö
fd450a5177 Create AVFormatContext objects as private transport for output RTSP sessions
Originally committed as revision 21964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 15:46:56 +00:00
Michael Niedermayer
0e5f33f242 Make sure a set r_frame_rate is not overriden by a guess.
Also make sure we dont waste time in this case with collecting timestamps.

Originally committed as revision 21957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 10:19:46 +00:00
Michael Niedermayer
403c545d08 Attempt to fix the completely random values returned by ff_avc_find_startcode().
Originally committed as revision 21955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-22 00:34:27 +00:00
Vitor Sessak
044a950d82 Fix memory leak for truncated packets in idCin demuxer
Originally committed as revision 21938 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-21 14:41:39 +00:00
Michael Niedermayer
bbdf0d2214 Make sure we dont write more bytes into filename than the array is long.
just a precaution in case the size of the source array is increased or
made dynamically allocateable.

Originally committed as revision 21926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:57:23 +00:00
Michael Niedermayer
6a2459059e Do not attempt to open references through absolute pathes.
This would allow an attacker to test remotely if a local file exists.

Originally committed as revision 21925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 22:48:09 +00:00
Vitor Sessak
2e5195646d Do not leave uninitialized data in the packet in MPC demuxer. Should allow for
adding a demuxer test to FATE.

Originally committed as revision 21916 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-20 11:22:47 +00:00
Martin Storsjö
4280f9bbcd Split rtsp_read_header() into two functions, so that the main part (now also
known as rtsp_connect()) can be used in the RTSP muxer.

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

Originally committed as revision 21915 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:23:40 +00:00
Martin Storsjö
e23d195deb Split out input-specific parts of rtsp_read_header() into its own, new,
function (rtsp_setup_input_streams()), as preparation for the upcoming
RTSP muxer.

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

Originally committed as revision 21914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 23:21:44 +00:00
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
Michael Niedermayer
1ac0893799 Correcting wrong looking stream_id validity check in avidec.
Originally committed as revision 21642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-05 11:50:44 +00:00
Michael Niedermayer
8c3b161e9e Dont try generic seek if seek request before first index entry and backward.
Fixes issue1275

Originally committed as revision 21633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 23:59:48 +00:00
Michael Niedermayer
43e4d57f66 Try to open decoders in av_find_stream_info() even if no packets for the
stream are found.
Fixes issue1385

Originally committed as revision 21630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 23:05:58 +00:00
Peter Ross
451b353d87 Indentation cleanup
Originally committed as revision 21624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 09:58:14 +00:00
Peter Ross
02c4f626a8 Extend IFF demuxer to parse PBM/ILBM bitmap chunks
Originally committed as revision 21623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 09:57:21 +00:00
Michael Niedermayer
3c8d75e65b Only set duration for streams where it is likely correct.
Fixes issue1120

Originally committed as revision 21620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-03 00:35:10 +00:00
Michael Niedermayer
bce8840a4e Set nb_frames.
Also add DXSA tag (commited by mistake in this commit, i can revert and recommit
seperately if someone wants)

Originally committed as revision 21619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 23:53:38 +00:00
Justin Johnson
c5e1e9827d Guess the duration before converting video and write guessed duration
into flv header.

Patch by Justin Johnson, justin D johnson3 A gmail

Originally committed as revision 21615 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 22:23:09 +00:00
Michael Niedermayer
c45ebd5461 Set AVPacket.pos in MPEG-PS demuxer.
Originally committed as revision 21604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-02 16:47:51 +00:00
Måns Rullgård
0694a009b6 Fix build
Originally committed as revision 21602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 23:30:30 +00:00
Alexis Ballier
9125806e34 Fix warnings about implicit function declaration when compiling rtpdec.c
Patch by Alexis Ballier, alexis D ballier A gmail

Originally committed as revision 21601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 23:10:04 +00:00
Anton Khirnov
ca76a11948 Add a list of generic tags and change demuxers to follow it.
Patch by Anton Khirnov, wyskas at gmail dot com

Originally committed as revision 21587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 11:39:10 +00:00
Michael Niedermayer
411ff3225f Increase search range if no end timestamp could be found for the duration
calculation.

Originally committed as revision 21577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 17:43:18 +00:00
Kostya Shishkov
971c55f186 Bink video codec id is there, demuxer can use it
Originally committed as revision 21574 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 16:21:49 +00:00
Peter Ross
40da0b3691 Latent libavformat version bump for Bink demuxer (r21569)
Originally committed as revision 21571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 13:01:00 +00:00
Peter Ross
2e375df5b2 Bink demuxer
Originally committed as revision 21569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-31 12:35:09 +00:00
Michael Niedermayer
c55806e3a2 Flag to ignore dts on frames that contain pts.
This works around common issues with mpeg-ps files with broken timestamps.
Also allows playing the broken sample from issue1024.

Originally committed as revision 21562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 22:55:12 +00:00
Reimar Döffinger
029ddf333c Store strings directly in mov_mdhd_language_map instead of using pointers,
which has a up to 200% overhead.
Also allows to use memcpy instead of strcpy.

Originally committed as revision 21560 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 22:05:26 +00:00
Reimar Döffinger
1c90d2985d Always consider the mov language code as 4 bytes fixed size and change the
function declaration to reflect this.

Originally committed as revision 21558 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:54:06 +00:00
Reimar Döffinger
832ec42858 Simplify conversion to 5-bit ASCII.
Originally committed as revision 21557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 21:50:47 +00:00
Stefano Sabatini
8757dc5e40 Remove duplicated empty line.
Originally committed as revision 21553 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 20:18:55 +00:00
Daniel Verkamp
2a33c673b1 Set duration in Smacker demuxer
Originally committed as revision 21538 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 10:37:52 +00:00
Daniel Verkamp
895ab7489b Demux Bink audio in Smacker files
Originally committed as revision 21537 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 10:31:10 +00:00
Kostya Shishkov
adb5496146 another 10l: forgot to change parent condition as well
Originally committed as revision 21535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 09:47:57 +00:00
Kostya Shishkov
b381a823cd 10l trocadero: now return value of ff_rtmp_packet_read() has different meaning
Originally committed as revision 21534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 09:45:52 +00:00
Kostya Shishkov
0b6b10d9da Make RTMP send/receive packet functions report number of bytes read or sent.
Originally committed as revision 21533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 09:24:52 +00:00
Kostya Shishkov
09b67cc4bd cosmetics: add an empty line between variable declarations and code
Originally committed as revision 21532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-30 08:38:11 +00:00
Baptiste Coudurier
012dc2c426 Remove MAX_STREAMS usage in ogg and mxf muxers
Originally committed as revision 21526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-29 06:38:00 +00:00
Ronald S. Bultje
45aa90807f Add RTP/H.263 depacketizer by Martin Storsjö <$firstname () $firstname st>.
Originally committed as revision 21512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 16:08:13 +00:00
Jai Menon
90d0379f5e Avoid using deprecated AVFormatParameters::[audio|video]_codec_id field.
Originally committed as revision 21511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 15:45:21 +00:00
Daniel Kristjansson
31277aebd9 Use av_mallocz in url_open_protocol for URLContext.
Patch by Daniel Kristjansson: danielk cuymedia net

Originally committed as revision 21501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 09:11:26 +00:00
Michael Niedermayer
12f1b1fec4 Remove last MAX_STREAMS from avienc.c
Originally committed as revision 21500 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 03:37:22 +00:00
Michael Niedermayer
b4f0e04c99 Introduce AVIStream struct and move stream based variables to it.
This removes all but one MAX_STREAM from avienc.c.

Originally committed as revision 21498 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-28 02:45:17 +00:00
Carl Eugen Hoyos
39c6b3f54c Support demuxing Blu-ray subtitles in matroska files.
Patch sent to mailing list by Taylor Ralph, taylor D ralph A gmail

Originally committed as revision 21491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:39:18 +00:00
Ronald S. Bultje
88248b76af Fix BSD compile (PF_UNSPEC is not a standard define, AF_UNSPEC is).
Originally committed as revision 21490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 22:31:13 +00:00
Michael Niedermayer
d30a8beb99 Fix duration calculation in the presence of a single wraping of the timeline.
Fixes issue1714.

Originally committed as revision 21485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 19:37:52 +00:00
Jai Menon
ad5cc780c0 Schedule an increase in the maximum number of streams
at next libavformat major version bump.

Originally committed as revision 21484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 19:13:35 +00:00
Michael Niedermayer
67b678bb40 Revert Revision: 21473
Log:
	Fix misc typos, patch by
	Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==).
This violates the spec.

Originally committed as revision 21478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 13:03:53 +00:00
Stefano Sabatini
e8a9d01846 Fix misc typos, patch by
Fabian Greffrath base64_decode(PGZhYmlhbkBncmVmZnJhdGguY29tPg==).

Originally committed as revision 21473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:31:52 +00:00
Stefano Sabatini
d19a046ebb Document av_register_protocol(), not that it really needs to be
documented but it's nice to have everything documented.

Originally committed as revision 21471 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-27 00:21:28 +00:00
Jeremy Morton
2700063655 Don't use tcp_fd if we're not using TCP-based connections (e.g. when
reading direct SDP files to set up UDP-based RTP-streams). Fixes
issue 1713. Patch by Jeremy Morton <ffmpeg game-point net>.

Originally committed as revision 21461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-26 15:51:54 +00:00
Martin Storsjö
6023d84a2b Load the proper getaddrinfo functions from ws2_32.dll, if they're present.
Patch by Martin Storsjö <martin at martin dot st>.

Originally committed as revision 21443 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-25 01:28:01 +00:00
Stefano Sabatini
b0634fd11e Doxument url_open().
Originally committed as revision 21437 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 22:07:32 +00:00
Carl Eugen Hoyos
895a9be60c Force codec_tag I420 for Quicktime Planar Y'CbCr 8-bit 4:2:0 raw codec,
because YV12 triggers an UV swap in rawdec.c, fixes issue 1687.

Originally committed as revision 21436 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 21:37:35 +00:00
Stefano Sabatini
725b3da981 Favor the term "URL" over "filename", as the API deals with URLs
rather than with simple filenames.

Originally committed as revision 21429 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 18:18:03 +00:00
Reimar Döffinger
f1d2b5728c Make url_read_complete handle EAGAIN more intelligently.
Only retry 2 - 5 times in quick succession and afterwards sleep a bit
to avoid creating high CPU load without any progress.

Originally committed as revision 21427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 18:09:46 +00:00
Stefano Sabatini
f1f78a9d85 Doxument url_close().
Originally committed as revision 21420 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 16:33:56 +00:00
Stefano Sabatini
333146ddc5 Doxument url_open_protocol().
Originally committed as revision 21417 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 13:31:25 +00:00
Stefano Sabatini
1f8ad15ad3 Doxument url_read().
Originally committed as revision 21415 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-24 13:07:54 +00:00
Reimar Döffinger
ddb901b74d Make url_read_complete retry on EAGAIN and return how much data it read
if it reached EOF, making it useful in more cases.

Originally committed as revision 21393 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-23 10:23:47 +00:00
Ronald S. Bultje
98287358e9 Print a warning when DATA chunk is encountered in the middle of chunk.
From multirate RM patch by Ronald S. Bultje

Originally committed as revision 21392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-23 09:42:52 +00:00
Stefano Sabatini
54a4f36d6e Remove conditional M_PI definition, it is already defined in
libavutil/mathematics.h indirectly included by libavformat/avformat.h.

Originally committed as revision 21388 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 23:16:23 +00:00
Martin Storsjö
a52ce57d4e Replace deprecated guess_format() with av_guess_format().
Patch by Martin Storsjö reverse(<ts.nitram@nitram>).

Originally committed as revision 21387 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 23:09:08 +00:00
Ronald S. Bultje
6481075443 Make style a little bit more K&R'ish.
Originally committed as revision 21383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 16:12:55 +00:00
Martin Storsjö
7c823d8b7f Rename a function which is no longer ipv6-specific. Patch by Martin Storsjö
<$firstname () $firstname st>.

Originally committed as revision 21382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 16:10:08 +00:00
Alan Steremberg
00eb13e05f Use the control URI from the SDP (if present) rather than the input filename,
if present. This fixes playback of a number of MS-RTSP streams, mostly these
for which playback contains a session key in the URI. Fixes issue 1697.
Patch by Alan Steremberg <$firstname dot $lastname () gmail com>.

Originally committed as revision 21381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 16:04:15 +00:00
Rafaël Carré
e380b9182b mkvenc: Write TrackTimecodeScale
patch by Rafael (dot) Carre (a) gmail (d) com

Originally committed as revision 21372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 20:49:27 +00:00
Ronald S. Bultje
2e13ecfeca Remove reply and content_ptr arguments from rtsp_send_cmd_async(), since
they are unused.

Originally committed as revision 21371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 20:04:17 +00:00
Ronald S. Bultje
f8c087333d Change on rtsp_send_cmd() to the _async() version since we don't use the
response anyway.

Originally committed as revision 21370 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 20:01:11 +00:00
Ronald S. Bultje
7eaa646fd6 Reindent after r21368.
Originally committed as revision 21369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 19:50:40 +00:00
Ronald S. Bultje
8b9457deab Pretty embarassing bug; we shouldn't use av_strlcatf() on an uninitialized
buffer, that is doomed to not work at some point.

Originally committed as revision 21368 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 19:48:30 +00:00
Martin Storsjö
073189917e Make output-example.c handle AAC audio.
Patch by Martin Storsjö martin martin st

Originally committed as revision 21367 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 17:10:13 +00:00
Martin Storsjö
b4d68544c8 Remove IPv4-only codepath. Patch by Martin Storsjö <$first $first st>.
Originally committed as revision 21365 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 15:42:05 +00:00
David Conrad
0fc07ad951 Set start_time and duration in AVStream instead of AVFormatContext for
formats with only one stream; the AVFormatContext values will be derived from
the AVStream and this helps in calculating stream bitrate.

Originally committed as revision 21361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-21 09:47:02 +00:00
Martin Storsjö
3d7b42f97b Use the configure check from r21351 and use it to properly define struct
sockaddr (in case it's not missing) so it always works on the system that
we are defining it for, in a RFC-2553/3493-compliant way (i.e. containing
a ss_family field). which is used in udp.c. Patch by Martin Storsjö
<$firstname $firstname st>.

Originally committed as revision 21352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-20 17:26:14 +00:00
Baptiste Coudurier
fdf4662211 fetch flv duration from file if it is set to 0 in metadata
Originally committed as revision 21329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-19 19:41:24 +00:00
Baptiste Coudurier
49c43fc278 reindent
Originally committed as revision 21311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:58:10 +00:00
Baptiste Coudurier
c3aeaa540d set average frame rate in mov demuxer
Originally committed as revision 21310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 23:56:04 +00:00
Baptiste Coudurier
c956611527 move aspect ratio code at the end of the track parsing, fix cathedral-beta2-400extra-crop-avc.mp4
Originally committed as revision 21301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 21:38:39 +00:00
Luca Abeni
22c1f65fa6 Rename the RTP muxer sources so that the packetisation functions are in
rtpenc_*.c files.

Originally committed as revision 21284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 13:44:12 +00:00
Luca Abeni
47a855648f Remove the ff_rtp_send_h264() prototype from rtp_h264.h (such function
belongs to the RTP muxer, and its prototype already is in rtpenc.h)

Originally committed as revision 21282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 11:18:25 +00:00
Ben Littler
5bc3fc2187 add uldx fourcc to mpeg4 in riff.c
Originally committed as revision 21279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-18 03:57:01 +00:00
Ben Littler
6667d5a5e5 add vspx fourcc to mpeg4 in riff.c
Originally committed as revision 21269 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-17 19:25:49 +00:00