diff options
| author | Martin Storsjö <martin@martin.st> | 2011-11-06 23:11:29 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-13 13:20:49 +0100 |
| commit | 9d77a8faf9568f02daf06903559473efb4050c34 (patch) | |
| tree | 1cb114b4b834a7a5ba94665f13971ca821973d69 /libavformat/mov.c | |
| parent | 1dee0aca7401fc6c01f23ceedaff6533efb0fb28 (diff) | |
| download | ffmpeg-9d77a8faf9568f02daf06903559473efb4050c34.tar.gz | |
avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 351058c968..ced60cbbb7 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -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 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); - if (!avio_open(pb, filename, AVIO_FLAG_READ)) + if (!avio_open2(pb, filename, AVIO_FLAG_READ, int_cb, NULL)) 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) { 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, "stream %d, error opening alias: path='%s', dir='%s', " "filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d\n", |