highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/avformat: Replace some references to filenames by urls

Browse Source 
Reviewed-by: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 41e07390e0)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-01-20 21:01:08 +01:00
parent 974f9d255d
commit 874945c7b9
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/avformat.h
View File

@@ -88,10 +88,10 @@
* cleanup. * cleanup.
* *
* @section lavf_decoding_open Opening a media file * @section lavf_decoding_open Opening a media file
* The minimum information required to open a file is its URL or filename, which * The minimum information required to open a file is its URL, which
* is passed to avformat_open_input(), as in the following code: * is passed to avformat_open_input(), as in the following code:
* @code * @code
* const char *url = "in.mp3"; * const char *url = "file:in.mp3";
* AVFormatContext *s = NULL; * AVFormatContext *s = NULL;
* int ret = avformat_open_input(&s, url, NULL, NULL); * int ret = avformat_open_input(&s, url, NULL, NULL);
* if (ret < 0) * if (ret < 0)
@@ -2033,7 +2033,7 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score
* *
* @param pb the bytestream to probe * @param pb the bytestream to probe
* @param fmt the input format is put here * @param fmt the input format is put here
* @param filename the filename of the stream * @param url the url of the stream
* @param logctx the log context * @param logctx the log context
* @param offset the offset within the bytestream to probe from * @param offset the offset within the bytestream to probe from
* @param max_probe_size the maximum probe buffer size (zero for default) * @param max_probe_size the maximum probe buffer size (zero for default)
@@ -2042,14 +2042,14 @@ AVInputFormat *av_probe_input_format3(AVProbeData *pd, int is_opened, int *score
* AVERROR code otherwise * AVERROR code otherwise
*/ */
int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt, int av_probe_input_buffer2(AVIOContext *pb, AVInputFormat **fmt,
const char *filename, void *logctx, const char *url, void *logctx,
unsigned int offset, unsigned int max_probe_size); unsigned int offset, unsigned int max_probe_size);
/** /**
* Like av_probe_input_buffer2() but returns 0 on success * Like av_probe_input_buffer2() but returns 0 on success
*/ */
int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt, int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
const char *filename, void *logctx, const char *url, void *logctx,
unsigned int offset, unsigned int max_probe_size); unsigned int offset, unsigned int max_probe_size);
/** /**
@@ -2060,7 +2060,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
* May be a pointer to NULL, in which case an AVFormatContext is allocated by this * May be a pointer to NULL, in which case an AVFormatContext is allocated by this
* function and written into ps. * function and written into ps.
* Note that a user-supplied AVFormatContext will be freed on failure. * Note that a user-supplied AVFormatContext will be freed on failure.
* @param filename Name of the stream to open. * @param url URL of the stream to open.
* @param fmt If non-NULL, this parameter forces a specific input format. * @param fmt If non-NULL, this parameter forces a specific input format.
* Otherwise the format is autodetected. * Otherwise the format is autodetected.
* @param options A dictionary filled with AVFormatContext and demuxer-private options. * @param options A dictionary filled with AVFormatContext and demuxer-private options.
@@ -2071,7 +2071,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
* *
* @note If you want to use custom IO, preallocate the format context and set its pb field. * @note If you want to use custom IO, preallocate the format context and set its pb field.
*/ */
int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputFormat *fmt, AVDictionary **options); int avformat_open_input(AVFormatContext **ps, const char *url, AVInputFormat *fmt, AVDictionary **options);
attribute_deprecated attribute_deprecated
int av_demuxer_open(AVFormatContext *ic); int av_demuxer_open(AVFormatContext *ic);