@@ -37,12 +37,14 @@

 /* unbuffered I/O */

+#if FF_API_OLD_AVIO

 /**

  * URL Context.

  * New fields can be added to the end with minor version bumps.

  * Removal, reordering and changes to existing fields require a major

  * version bump.

  * sizeof(URLContext) must not be used outside libav*.

+ * @deprecated This struct will be made private

  */

 typedef struct URLContext {

 #if FF_API_URL_CLASS

@@ -57,7 +59,6 @@ typedef struct URLContext {

     int is_connected;

 } URLContext;

-#if FF_API_OLD_AVIO

 typedef struct URLPollEntry {

     URLContext *handle;

     int events;

@@ -21,6 +21,7 @@

 #define AVFORMAT_AVIO_INTERNAL_H

 #include "avio.h"

+#include "url.h"

 int ffio_init_context(AVIOContext *s,

                   unsigned char *buffer,

@@ -29,6 +29,7 @@

 #include <sys/stat.h>

 #include <stdlib.h>

 #include "os_support.h"

+#include "url.h"

 /* standard file protocol */

@@ -22,7 +22,7 @@

 #ifndef AVFORMAT_HTTP_H

 #define AVFORMAT_HTTP_H

-#include "avio.h"

+#include "url.h"

 /**

  * Set custom HTTP headers.

@@ -25,6 +25,7 @@

  */

 #include "avformat.h"

+#include "url.h"

 #include <librtmp/rtmp.h>

 #include <librtmp/log.h>

@@ -21,7 +21,7 @@

 #ifndef AVFORMAT_MMS_H

 #define AVFORMAT_MMS_H

-#include "avformat.h"

+#include "url.h"

 typedef struct {

     int id;

@@ -23,6 +23,7 @@

 #define AVFORMAT_RTMPPKT_H

 #include "avformat.h"

+#include "url.h"

 /** maximum possible number of different RTMP channels */

 #define RTMP_CHANNELS 65599

@@ -25,6 +25,7 @@

 #include "libavcodec/avcodec.h"

 #include "avformat.h"

 #include "rtp.h"

+#include "url.h"

 typedef struct PayloadContext PayloadContext;

 typedef struct RTPDynamicProtocolHandler_s RTPDynamicProtocolHandler;

@@ -23,6 +23,7 @@

 #define AVFORMAT_RTPENC_CHAIN_H

 #include "avformat.h"

+#include "url.h"

 AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,

                                        URLContext *handle, int packet_size);

@@ -32,6 +32,17 @@

 #define URL_PROTOCOL_FLAG_NESTED_SCHEME 1 /*< The protocol name can be the first part of a nested protocol scheme */

 extern int (*url_interrupt_cb)(void);

+

+typedef struct URLContext {

+    const AVClass *av_class;    /**< information for av_log(). Set by url_open(). */

+    struct URLProtocol *prot;

+    void *priv_data;

+    char *filename;             /**< specified URL */

+    int flags;

+    int max_packet_size;        /**< if non zero, the stream is packetized with this max packet size */

+    int is_streamed;            /**< true if streamed (no seek possible), default = false */

+    int is_connected;

+} URLContext;

 #endif

 /**