Martin Storsjö
57b5555c91
Use ff_url_join for assembling URLs, instead of snprintf
...
This ensures proper escaping of numerical IPv6 addresses.
The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.
Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:35:21 +00:00
Martin Storsjö
780d7897a9
Add a function ff_url_join for assembling URLs
...
Originally committed as revision 22225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:31:45 +00:00
Martin Storsjö
67d4b3f205
Always call ff_network_init/ff_network_close when opening protocols
...
ff_network_init is a no-op on all platforms except windows, and on
windows the performance penalty is minimal (less than 1 ms in my tests).
Originally committed as revision 22224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:30:21 +00:00
Vitor Sessak
5301a05d3e
Fix memory leak in NUT muxer
...
Originally committed as revision 22222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 17:26:34 +00:00
Martin Storsjö
886f3f2f36
Return from rtp_read when select returns an error
...
Originally committed as revision 22219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 08:15:20 +00:00
David Conrad
8b6bdb6cf3
oggdec: Parse theora headers since ogg might not mark keyframes
...
Fixes issue746
Originally committed as revision 22214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 00:22:40 +00:00
Martin Storsjö
c2b40ac229
Check url_interrupt_cb in rtp_read, wait in select for max 100 ms before rechecking url_interrupt_cb
...
Originally committed as revision 22209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 15:08:54 +00:00
Peter Ross
6c88dc3dbf
handle errors reported by av_get_packet() in Bink demuxer
...
Originally committed as revision 22208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 13:27:53 +00:00
Peter Ross
4ffa6e78c2
Guard against invalid memory read
...
Originally committed as revision 22207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 13:26:01 +00:00
David Conrad
871b641b80
Ensure that we write clusters and blocks with known size when streaming
...
Too many demuxers can't cope with clusters of unknown size.
Originally committed as revision 22201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:14 +00:00
David Conrad
434a70b8f1
Fix indentation
...
Originally committed as revision 22200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:11 +00:00
David Conrad
30f06a58a0
Simplify starting and ending clusters
...
Originally committed as revision 22199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:08 +00:00
David Conrad
7a2a484081
Write the first seekhead if writing to a stream, we won't be able to seek
...
back and write it at the end
Originally committed as revision 22198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:04 +00:00
David Conrad
2529bb3019
Attempt seeking to write EBML master sizes even if streamed
...
Most EBML masters are much smaller than IO_BUFFER_SIZE and thus the size
can be updated. This makes parsing the resulting files easier.
Originally committed as revision 22197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-04 08:53:00 +00:00
Anton Khirnov
690b412657
matroskaenc: use "title" tag instead of "description" in track title.
...
Patch by Anton Khirnov < whyskas at gmail >
Originally committed as revision 22187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 23:27:34 +00:00
Aurelien Jacobs
68b0fd7c68
matroskadec: cosmetic indentation
...
Originally committed as revision 22185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 21:49:24 +00:00
Joakim Plate
3e93c8ed14
matroskadec: timestamps are dts and not pts in ms vfw compatibility mode
...
original patch by elupus _at_ ecce _dot_ se
Originally committed as revision 22184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 21:46:43 +00:00
Martin Storsjö
b9b8ed2a02
Properly pad H.264 extradata when taken from fmtp SDP attributes
...
This fixes some valgrind warnings.
Originally committed as revision 22182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 21:00:50 +00:00
Vitor Sessak
4b83fc0fe4
Plug memory leak in NUT muxer and demuxer
...
Originally committed as revision 22174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 17:31:24 +00:00
Jai Menon
1f6d0d42c5
Plug memory leak in NSV demuxer.
...
Patch by Jai Menon.
Originally committed as revision 22173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 17:26:00 +00:00
Peter Ross
a27998010c
Support demuxing of streamed Bink files
...
Originally committed as revision 22166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-03 09:44:30 +00:00
Vitor Sessak
5eef7bcd09
Plug memory leak for truncated files
...
Originally committed as revision 22154 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:32:56 +00:00
Vitor Sessak
38beab19ab
Plug some memory leaks for truncated files
...
Originally committed as revision 22153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-02 21:32:29 +00:00
Vitor Sessak
8a4d067dfc
Revert r22119 and partially revert 22120.
...
Originally committed as revision 22135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-01 18:16:10 +00:00
Anton Khirnov
e1c0b00b06
nutdec: make chapter start and length uint64_t to prevent overflows.
...
Patch by Anton Khirnov wyskas chez gmail punto com
Originally committed as revision 22127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-01 07:26:41 +00:00
Reimar Döffinger
11a74f3639
Explicitly set struct addrinfo to NULL if getaddrinfo failed instead of
...
assuming getaddrinfo will have done this.
Originally committed as revision 22123 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 22:33:22 +00:00
Reimar Döffinger
a34fc5e23d
Make our getaddrinfo implementation initialize "struct addrinfo" return
...
value to NULL on errors.
Originally committed as revision 22122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 22:31:17 +00:00
Vitor Sessak
27dbc47c05
Plug some memory leaks in NUT muxer and demuxer
...
Originally committed as revision 22120 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 20:49:21 +00:00
Anton Khirnov
82f50f820e
Print chapter info in dump_format().
...
Patch by Anton Khirnov, wyskas gmail
Originally committed as revision 22113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 18:37:09 +00:00
Michael Niedermayer
5692ed3ad4
Many mp3s seem to contain padding after id3 tags that is not considered in the
...
tag size. Skip this to make the format probing quicker.
Originally committed as revision 22111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 16:40:17 +00:00
Martin Storsjö
f65919af7e
Rename RTP depacketizer files from rtp_* to rtpdec_*
...
Originally committed as revision 22109 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 11:03:14 +00:00
Carl Eugen Hoyos
1e6365b305
Include rtpdec.h, it contains prototypes for the following functions:
...
rtp_set_remote_url(), rtp_get_local_port(), rtp_get_file_handles()
Originally committed as revision 22107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 03:59:15 +00:00
Carl Eugen Hoyos
dda8fc6a09
Include avc.h from avc.c: It contains several prototypes.
...
Originally committed as revision 22098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 02:04:34 +00:00
Carl Eugen Hoyos
998257bd4f
Make mp4_read_descr static: It is only used inside libavformat/mov.c.
...
Originally committed as revision 22097 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 01:51:13 +00:00
Carl Eugen Hoyos
c53ffb2ce5
Include apetag.h which contains the prototype for ff_ape_parse_tag().
...
Originally committed as revision 22096 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 01:43:47 +00:00
Martin Storsjö
50ff78db01
RTSP muxer: Use a local copy of the AVPacket for sending to the chained muxer
...
This way, we avoid overwriting stream_index in the user's AVPacket
with a nonsense value.
Originally committed as revision 22081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-26 16:21:56 +00:00
Anton Khirnov
cba2f6d51b
asfenc: write tags in proper UTF-16.
...
Patch by Anton Khirnov wyskas gmail com
Originally committed as revision 22059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 16:59:55 +00:00
Anton Khirnov
a677078e14
asfenc: simplify writing of comment header.
...
Patch by Anton Khirnov wyskas gmail com
Originally committed as revision 22058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 16:50:26 +00:00
Anton Khirnov
e4ea625ab0
asfdec: don't strip the "WM/" prefix, this should be done during conversion.
...
Patch by Anton Khirnov wyskas gmail com
Originally committed as revision 22057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 16:38:23 +00:00
Benoit Fouet
a5517dcc9a
asf: indent.
...
Patch from Anton Khirnov wyskas gmail com
Originally committed as revision 22050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:10:37 +00:00
Benoit Fouet
9b54f4328e
asf: add more entries to metadata conv table.
...
Patch from Anton Khirnov wyskas gmail com
Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:09:39 +00:00
Anton Khirnov
fce4448948
Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
...
metadata system.
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 22034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:19:54 +00:00
Anton Khirnov
a106d4112d
Don't add WM prefixes to all written ASF tags.
...
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:17:32 +00:00
Anton Khirnov
531d8fa308
Eliminate put_str16().
...
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 22031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:09:49 +00:00
Anton Khirnov
6164842300
Mention that metadata tags are (unvalidated) UTF-8.
...
Patch by Anton Khirnov <wyskas gmail com>.
Originally committed as revision 22028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:01:44 +00:00
Peter Ross
dd80be5bfc
low-complexity Bink file seeking
...
Originally committed as revision 22022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 11:43:33 +00:00
Peter Ross
7e276c85b1
set AVINDEX_KEYFRAME correctly for bink
...
Originally committed as revision 22021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 11:30:38 +00:00
Yann Coupin
8d819221db
Correctly increment continuity_counter in PCR packets.
...
Patch by Yann Coupin, yann.coupin+ffmpeg gmail
Originally committed as revision 22020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 10:56:13 +00:00
Benoit Fouet
6538c0f1c6
asfdec: skip byte array tags.
...
Patch from Anton Khirnov wyskas gmail
Originally committed as revision 22019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:34:12 +00:00
Benoit Fouet
27e7492771
asfdec: add a debug message about skipped tags.
...
Patch from Anton Khirnov wyskas gmail
Originally committed as revision 22018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:33:18 +00:00
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