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/img2.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/img2.c')
| -rw-r--r-- | libavformat/img2.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavformat/img2.c b/libavformat/img2.c index 56c4850efe..25ed2b32e8 100644 --- a/libavformat/img2.c +++ b/libavformat/img2.c @@ -269,7 +269,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) s->path, s->img_number)<0 && s->img_number > 1) return AVERROR(EIO); for(i=0; i<3; i++){ - if (url_fopen(&f[i], filename, URL_RDONLY) < 0) { + if (avio_open(&f[i], filename, URL_RDONLY) < 0) { if(i==1) break; av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename); @@ -300,7 +300,7 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt) if(size[i]){ ret[i]= avio_read(f[i], pkt->data + pkt->size, size[i]); if (!s->is_pipe) - url_fclose(f[i]); + avio_close(f[i]); if(ret[i]>0) pkt->size += ret[i]; } @@ -353,7 +353,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) return AVERROR(EIO); } for(i=0; i<3; i++){ - if (url_fopen(&pb[i], filename, URL_WRONLY) < 0) { + if (avio_open(&pb[i], filename, URL_WRONLY) < 0) { av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename); return AVERROR(EIO); } @@ -373,8 +373,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) avio_write(pb[2], pkt->data + ysize +(pkt->size - ysize)/2, (pkt->size - ysize)/2); put_flush_packet(pb[1]); put_flush_packet(pb[2]); - url_fclose(pb[1]); - url_fclose(pb[2]); + avio_close(pb[1]); + avio_close(pb[2]); }else{ if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){ AVStream *st = s->streams[0]; @@ -403,7 +403,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) } put_flush_packet(pb[0]); if (!img->is_pipe) { - url_fclose(pb[0]); + avio_close(pb[0]); } img->img_number++; |