ffmpeg source update for sep 09

source/patched-ffmpeg-mt/libavformat/rtsp.h

 /*
  * RTSP definitions
  * Copyright (c) 2002 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
  * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
@@ skipping 78 matching lines @@
     int client_port_min, client_port_max;
 
     /** UDP unicast server port range; the ports to which we should connect
      * to receive unicast UDP RTP/RTCP data. */
     int server_port_min, server_port_max;
 
     /** time-to-live value (required for multicast); the amount of HOPs that
      * packets will be allowed to make before being discarded. */
     int ttl;
 
-    uint32_t destination; /**< destination IP address */
+    struct sockaddr_storage destination; /**< destination IP address */
+    char source[INET6_ADDRSTRLEN + 1]; /**< source IP address */
 
     /** data/packet transport protocol; e.g. RTP or RDT */
     enum RTSPTransport transport;
 
     /** network layer transport protocol; e.g. TCP or UDP uni-/multicast */
     enum RTSPLowerTransport lower_transport;
 } RTSPTransportField;
 
 /**
  * This describes the server response to each RTSP command.
@@ skipping 150 matching lines @@
      * packet from */
     void *cur_transport_priv;
 
     /** The following are used for Real stream selection */
     //@{
     /** whether we need to send a "SET_PARAMETER Subscribe:" command */
     int need_subscription;
 
     /** stream setup during the last frame read. This is used to detect if
      * we need to subscribe or unsubscribe to any new streams. */
-    enum AVDiscard real_setup_cache[MAX_STREAMS];
+    enum AVDiscard *real_setup_cache;
+
+    /** current stream setup. This is a temporary buffer used to compare
+     * current setup to previous frame setup. */
+    enum AVDiscard *real_setup;
 
     /** the last value of the "SET_PARAMETER Subscribe:" RTSP command.
      * this is used to send the same "Unsubscribe:" if stream setup changed,
      * before sending a new "Subscribe:" command. */
     char last_subscription[1024];
     //@}
 
     /** The following are used for RTP/ASF streams */
     //@{
     /** ASF demuxer context for the embedded ASF stream from WMS servers */
@@ skipping 11 matching lines @@
 
     /** The synchronized start time of the output streams. */
     int64_t start_time;
 
     /** Additional output handle, used when input and output are done
      * separately, eg for HTTP tunneling. */
     URLContext *rtsp_hd_out;
 
     /** RTSP transport mode, such as plain or tunneled. */
     enum RTSPControlTransport control_transport;
+
+    /* Number of RTCP BYE packets the RTSP session has received.
+     * An EOF is propagated back if nb_byes == nb_streams.
+     * This is reset after a seek. */
+    int nb_byes;
 } RTSPState;
 
 /**
  * Describes a single stream, as identified by a single m= line block in the
  * SDP content. In the case of RDT, one RTSPStream can represent multiple
  * AVStreams. In this case, each AVStream in this set has similar content
  * (but different codec/bitrate).
  */
 typedef struct RTSPStream {
     URLContext *rtp_handle;   /**< RTP stream handle (if UDP) */
     void *transport_priv; /**< RTP/RDT parse context if input, RTP AVFormatContext if output */
 
     /** corresponding stream index, if any. -1 if none (MPEG2TS case) */
     int stream_index;
 
     /** interleave IDs; copies of RTSPTransportField->interleaved_min/max
      * for the selected transport. Only used for TCP. */
     int interleaved_min, interleaved_max;
 
     char control_url[1024];   /**< url for this stream (from SDP) */
 
     /** The following are used only in SDP, not RTSP */
     //@{
     int sdp_port;             /**< port (from SDP content) */
-    struct in_addr sdp_ip;    /**< IP address (from SDP content) */
+    struct sockaddr_storage sdp_ip; /**< IP address (from SDP content) */
     int sdp_ttl;              /**< IP Time-To-Live (from SDP content) */
     int sdp_payload_type;     /**< payload type */
     //@}
 
     /** The following are used for dynamic protocols (rtp_*.c/rdt.c) */
     //@{
     /** handler structure */
     RTPDynamicProtocolHandler *dynamic_handler;
 
     /** private data associated with the dynamic protocol */
@@ skipping 118 matching lines @@
 void ff_rtsp_close_streams(AVFormatContext *s);
 
 /**
  * Close all connection handles within the RTSP (de)muxer
  *
  * @param rt RTSP (de)muxer context
  */
 void ff_rtsp_close_connections(AVFormatContext *rt);
 
 #endif /* AVFORMAT_RTSP_H */