Commit Graph

117 Commits

Author SHA1 Message Date
Michael Niedermayer
2fd41c9067 Merge remote-tracking branch 'newdev/master'
* newdev/master:
  avio: make udp_set_remote_url/get_local_port internal.
  asfdec: also subtract preroll when reading simple index object
  matroskaenc: remove a variable that's unused after bc17bd9.
  avio: cosmetics - nicer vertical alignment.
  Remove unnecessary icc version checks
  Disable 'attribute "foo" ignored' warnings from icc
  rtsp: Don't use a locale dependent format string
  Add xd55 codec tag for XDCAM HD422 720p25 CBR files.
  configure: get libavcodec version from new version.h header
  lavc: move the version macros to a new installed header.
  matroskaenc: simplify get_aac_sample_rates by using ff_mpeg4audio_get_config
  Do not use format string "%0.3f" for RTSP Range field.
  Add apply_window_int16() to DSPContext with x86-optimized versions and use it in the ac3_fixed encoder.
  Document usage of import libraries created by dlltool
  configure: Set the correct lib target for arm/wince dlltool
  fate: simplify regression-funcs.sh
  fate: add support for multithread testing

Conflicts:
	libavformat/rtspdec.c
	libavutil/attributes.h
	libavutil/internal.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-03-24 02:16:11 +01:00
Anton Khirnov
4ec153bb66 avio: make udp_set_remote_url/get_local_port internal. 2011-03-23 17:32:13 +01:00
Michael Niedermayer
a6be21d3ba Revert "replace FFmpeg with Libav in doc/"
This reverts commit f8a45fa1b1.

Conflicts:

	doc/optimization.txt
2011-03-17 17:26:45 +01:00
Luca Barbato
4af9c1a56f doc: update applehttp documentation
Integrate more comments from Stefano.
2011-03-17 03:34:16 +01:00
Janne Grunau
f8a45fa1b1 replace FFmpeg with Libav in doc/
unless it stands for ffmpeg the program or is historic
2011-03-16 22:01:01 +01:00
Luca Barbato
0e6a3ee4fa doc: document applehttp protocol
The documentation might be extended once/if a live/store override option
will have to be provided for non-compliant segmenter.
2011-03-13 16:34:58 +01: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ö
01c8d258da Add a SAP demuxer
Originally committed as revision 25463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-13 09:06:59 +00:00
Martin Storsjö
61c089a81b Document the SAP muxer
Originally committed as revision 25427 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-09 18:50:02 +00:00
Martin Storsjö
f6833fc1c6 Add protocol documentation on the connect option to the udp protocol
Originally committed as revision 25407 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-08 08:49:56 +00:00
Martin Storsjö
92c5052db9 Add protocol documentation on RTSP
Originally committed as revision 25330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-04 07:06:58 +00:00
Stefano Sabatini
0fb226b37a Document udp protocol.
Based on a patch by Aviad Rozenhek aviadr1 @ reverse(moc.liamg).

Originally committed as revision 25192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 10:16:15 +00:00
Ronald S. Bultje
f5ea69b235 MMSH support, the most popular and widely used of all MMS variants. Written by
Zhentan Feng <spyfeng gmail com> as part of Google's Summer of Code program.

Originally committed as revision 24861 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-21 19:04:41 +00:00
Stefano Sabatini
2d7b5f091d Apply misc docs fixes spotted by Diego.
Originally committed as revision 24739 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 21:06:46 +00:00
Stefano Sabatini
209e451a32 Apply misc fixes spotted by Diego to protocols.texi.
Originally committed as revision 24726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 23:15:35 +00:00
Stefano Sabatini
1de4cfe635 Add protocols.texi.
Originally committed as revision 24616 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 15:45:29 +00:00