diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 02:05:02 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-17 02:09:31 +0400 |
commit | 1f87cbe8349d8662c0d6ead40cc39620b01ae0da (patch) | |
tree | b986665a569a53b76cbc86263d1ba1a4645c8d01 /libavformat/internal.h | |
parent | 8097307bfb6a90d18d35a870ff61016111820ab7 (diff) | |
parent | df9f22d42b0905385629a9d368bb5a1eef2b45ef (diff) |
Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'
* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
avf: move url utility functions in a separate file
Conflicts:
libavformat/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/internal.h')
-rw-r--r-- | libavformat/internal.h | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index d1bbf33603..ee66e8c04e 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -90,31 +90,6 @@ void ff_read_frame_flush(AVFormatContext *s); uint64_t ff_ntp_time(void); /** - * Assemble a URL string from components. This is the reverse operation - * of av_url_split. - * - * Note, this requires networking to be initialized, so the caller must - * ensure ff_network_init has been called. - * - * @see av_url_split - * - * @param str the buffer to fill with the url - * @param size the size of the str buffer - * @param proto the protocol identifier, if null, the separator - * after the identifier is left out, too - * @param authorization an optional authorization string, may be null. - * An empty string is treated the same as a null string. - * @param hostname the host name string - * @param port the port number, left out from the string if negative - * @param fmt a generic format string for everything to add after the - * host/port, may be null - * @return the number of characters written to the destination buffer - */ -int ff_url_join(char *str, int size, const char *proto, - const char *authorization, const char *hostname, - int port, const char *fmt, ...) av_printf_format(7, 8); - -/** * Append the media-specific SDP fragment for the media stream c * to the buffer buff. * @@ -240,17 +215,6 @@ AVChapter *avpriv_new_chapter(AVFormatContext *s, int id, AVRational time_base, */ void ff_reduce_index(AVFormatContext *s, int stream_index); -/** - * Convert a relative url into an absolute url, given a base url. - * - * @param buf the buffer where output absolute url is written - * @param size the size of buf - * @param base the base url, may be equal to buf. - * @param rel the new url, which is interpreted relative to base - */ -void ff_make_absolute_url(char *buf, int size, const char *base, - const char *rel); - enum AVCodecID ff_guess_image2_codec(const char *filename); /** |