eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-15 19:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Martin Storsjö
2011-11-06 23:11:29 +02:00
committed by Anton Khirnov
parent 1dee0aca74
commit 9d77a8faf9
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/applehttp.c
View File

@@ -210,7 +210,8 @@ static int parse_playlist(AppleHTTPContext *c, const char *url,
if (!in) { if (!in) {
close_in = 1; close_in = 1;
if ((ret = avio_open(&in, url, AVIO_FLAG_READ)) < 0) if ((ret = avio_open2(&in, url, AVIO_FLAG_READ,
c->interrupt_callback, NULL)) < 0)
return ret; return ret;
} }

3
libavformat/applehttpproto.c
View File

@@ -114,7 +114,8 @@ static int parse_playlist(URLContext *h, const char *url)
char line[1024]; char line[1024];
const char *ptr; const char *ptr;
if ((ret = avio_open(&in, url, AVIO_FLAG_READ)) < 0) if ((ret = avio_open2(&in, url, AVIO_FLAG_READ,
&h->interrupt_callback, NULL)) < 0)
return ret; return ret;
read_chomp_line(in, line, sizeof(line)); read_chomp_line(in, line, sizeof(line));

6
libavformat/img2.c
View File

@@ -304,7 +304,8 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt)
s->path, s->img_number)<0 && s->img_number > 1) s->path, s->img_number)<0 && s->img_number > 1)
return AVERROR(EIO); return AVERROR(EIO);
for(i=0; i<3; i++){ for(i=0; i<3; i++){
if (avio_open(&f[i], filename, AVIO_FLAG_READ) < 0) { if (avio_open2(&f[i], filename, AVIO_FLAG_READ,
&s1->interrupt_callback, NULL) < 0) {
if(i==1) if(i==1)
break; break;
av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename); av_log(s1, AV_LOG_ERROR, "Could not open file : %s\n",filename);
@@ -388,7 +389,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return AVERROR(EIO); return AVERROR(EIO);
} }
for(i=0; i<3; i++){ for(i=0; i<3; i++){
if (avio_open(&pb[i], filename, AVIO_FLAG_WRITE) < 0) { if (avio_open2(&pb[i], filename, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL) < 0) {
av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename); av_log(s, AV_LOG_ERROR, "Could not open file : %s\n",filename);
return AVERROR(EIO); return AVERROR(EIO);
} }

7
libavformat/mov.c
View File

@@ -1770,7 +1770,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
} }
} }
static int mov_open_dref(AVIOContext **pb, char *src, MOVDref *ref) static int mov_open_dref(AVIOContext **pb, char *src, MOVDref *ref,
AVIOInterruptCB *int_cb)
{ {
/* try relative path, we do not try the absolute because it can leak information about our /* try relative path, we do not try the absolute because it can leak information about our
system to an attacker */ system to an attacker */
@@ -1805,7 +1806,7 @@ static int mov_open_dref(AVIOContext **pb, char *src, MOVDref *ref)
av_strlcat(filename, ref->path + l + 1, 1024); av_strlcat(filename, ref->path + l + 1, 1024);
if (!avio_open(pb, filename, AVIO_FLAG_READ)) if (!avio_open2(pb, filename, AVIO_FLAG_READ, int_cb, NULL))
return 0; return 0;
} }
} }
@@ -1860,7 +1861,7 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) { if (sc->dref_id-1 < sc->drefs_count && sc->drefs[sc->dref_id-1].path) {
MOVDref *dref = &sc->drefs[sc->dref_id - 1]; MOVDref *dref = &sc->drefs[sc->dref_id - 1];
if (mov_open_dref(&sc->pb, c->fc->filename, dref) < 0) if (mov_open_dref(&sc->pb, c->fc->filename, dref, &c->fc->interrupt_callback) < 0)
av_log(c->fc, AV_LOG_ERROR, av_log(c->fc, AV_LOG_ERROR,
"stream %d, error opening alias: path='%s', dir='%s', " "stream %d, error opening alias: path='%s', dir='%s', "
"filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n", "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n",

3
libavformat/utils.c
View File

@@ -593,7 +593,8 @@ static int init_input(AVFormatContext *s, const char *filename)
(!s->iformat && (s->iformat = av_probe_input_format(&pd, 0)))) (!s->iformat && (s->iformat = av_probe_input_format(&pd, 0))))
return 0; return 0;
if ((ret = avio_open(&s->pb, filename, AVIO_FLAG_READ)) < 0) if ((ret = avio_open2(&s->pb, filename, AVIO_FLAG_READ,
&s->interrupt_callback, NULL)) < 0)
return ret; return ret;
if (s->iformat) if (s->iformat)
return 0; return 0;