Commit Graph

5774 Commits

Author SHA1 Message Date
Måns Rullgård 22f73dccad Move resolve_host() to ffserver.c
This deprecated function is only used by ffserver, yet does not have
a prototype visible there.

In the long term, ffserver should be made IPv6-aware.  In the meantime,
this change removes cruft from lavf and fixes some warnings in ffserver.

Originally committed as revision 22329 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 18:43:27 +00:00
Vladimir Pantelic 88b51ea948 Use ASF supports "markers" which are a name and a time stamp to create
lavf chapters.
Patch by Vladimir Pantelic pan (arobase) nt tu (dash) darmstadt de

Originally committed as revision 22326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 13:13:18 +00:00
Martin Storsjö 002a6d0ea6 Add doxygen documentation for ff_url_split
Originally committed as revision 22323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:07:41 +00:00
Martin Storsjö f984dcf6dd Reindent
Originally committed as revision 22322 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:05:03 +00:00
Martin Storsjö c5c6e67c28 Rename url_split to ff_url_split
Since this function isn't in the public API, it should have an ff_ prefix.

Originally committed as revision 22321 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 09:03:25 +00:00
Måns Rullgård f19341e17a Revert "Move the probe loop from av_open_input_file() into its own method"
This reverts r22296.  This change made some files to fail to open.
The patch submitter has promised to investigate next week.

Originally committed as revision 22315 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 03:46:37 +00:00
Måns Rullgård d9747e29b6 IFF: move ff_cmap_read_palette() prototype to a header file
Originally committed as revision 22307 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 02:36:00 +00:00
Wolfram Gloger ae2c694388 Fix concat seeking SEEK_END case.
Patch by Wolfram Gloger wmglo ^ dent.med.uni-muenchen.de.

Originally committed as revision 22306 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 00:40:22 +00:00
Wolfram Gloger 35eaadcba0 Fix concat seek result.
Patch by Wolfram Gloger wmglo AT-SIGN dent.med.uni-muenchen DOT de.

Originally committed as revision 22302 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 00:22:03 +00:00
Alex Converse e7e291e960 av_find_stream_info(): Add a workaround for backwards compatible HE-AAC signaling.
The sample rate, frame size, and channel count from the container are
not reliable when backwards compatible signaling is used.

Originally committed as revision 22301 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 00:00:50 +00:00
Daniel Kristjansson 663322c1b8 Fix pts->dts conversion init for non-zero initial value for pts.
Patch by Daniel Kristjansson, danielk cuymedia net

Originally committed as revision 22297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 23:10:18 +00:00
Micah F. Galizia 4245c6ec4e Move the probe loop from av_open_input_file() into its own method
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22296 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 22:42:11 +00:00
David Conrad 38c3b6e73e inet_aton needs _DARWIN_C_SOURCE on OS X
Originally committed as revision 22285 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:49:02 +00:00
David Conrad ac11d562e5 Localize the #define _SVID_SOURCE needed for inet_aton() to os_support.c
Originally committed as revision 22284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 19:48:59 +00:00
Kostya Shishkov f3cb1cd078 1l trocadero: forgot reference operator on bytestream_get_be32() argument
Originally committed as revision 22277 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 08:52:53 +00:00
David Conrad 457c08ba3c Add internal.h include for av_read_frame_flush prototype
Fixes build with clang

Originally committed as revision 22273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 02:35:45 +00:00
David Conrad 148e8f2d29 Fix warning about incompatible pointer types
Originally committed as revision 22272 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 02:26:34 +00:00
David Conrad e48f7ff3cb matroskadec: Fix a buffer overread
Originally committed as revision 22271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 02:26:30 +00:00
Måns Rullgård e16c73e67e Move av_read_frame_flush() prototype to lavf/internal.h
Originally committed as revision 22268 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 23:19:05 +00:00
Måns Rullgård c26e58e32c Add some missing #includes
Originally committed as revision 22258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 22:36:36 +00:00
Reimar Döffinger 5189573c6d Set GXF fallback time-base to match the one specified for audio-only.
Originally committed as revision 22257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 22:25:53 +00:00
Reimar Döffinger 192c14fa55 GXF time base is always based on "fields" per second even for
non-interlaced video.
Should fix issue 1766.

Originally committed as revision 22256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 22:20:33 +00:00
Martin Storsjö 814c56413d Don't explicitly initialize networking in the tcp and udp protocols
Networking is always initialized when opening protocols.

Originally committed as revision 22227 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-05 22:38:48 +00:00
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