diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 22:45:20 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-02-23 18:22:03 +0100 |
| commit | ebb92e076883f87cee2a3ddd4a7fe164f422f462 (patch) | |
| tree | 884592f35c0a1e775c2393d1d535f26e648a8f8f /libavformat/utils.c | |
| parent | c24a40349693e50aa81ef68a4a522503ca504d50 (diff) | |
| download | ffmpeg-ebb92e076883f87cee2a3ddd4a7fe164f422f462.tar.gz | |
avio: rename url_fopen/fclose -> avio_open/close.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22a3212e32b696028e21f00871f3cb48c044029d)
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d609b872e3..439a2874d2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -616,7 +616,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, hack needed to handle RTSP/TCP */ if (!fmt || !(fmt->flags & AVFMT_NOFILE)) { /* if no file needed do not try to open one */ - if ((err=url_fopen(&pb, filename, URL_RDONLY)) < 0) { + if ((err=avio_open(&pb, filename, URL_RDONLY)) < 0) { goto fail; } if (buf_size > 0) { @@ -647,7 +647,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, fail: av_freep(&pd->buf); if (pb) - url_fclose(pb); + avio_close(pb); if (ap && ap->prealloced_context) av_free(*ic_ptr); *ic_ptr = NULL; @@ -2623,7 +2623,7 @@ void av_close_input_file(AVFormatContext *s) AVIOContext *pb = s->iformat->flags & AVFMT_NOFILE ? NULL : s->pb; av_close_input_stream(s); if (pb) - url_fclose(pb); + avio_close(pb); } AVStream *av_new_stream(AVFormatContext *s, int id) |