diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-20 02:35:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-01-31 00:23:45 +0100 |
| commit | 8c2f006d10c7e8df42d6ee57060bd1ce6ff3298f (patch) | |
| tree | fec78e925cfac536efa0c7bfaf4e82253cdfe3d3 | |
| parent | 3cd17b9b5c4301405c99bcb6897f7ebf975ad1ea (diff) | |
| download | ffmpeg-8c2f006d10c7e8df42d6ee57060bd1ce6ff3298f.tar.gz | |
avformat/img2dec: Use AVOpenCallback
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit b750b67d13696fdbcd62ce7238eb2826f2be4686)
Conflicts:
libavformat/img2dec.c
| -rw-r--r-- | libavformat/img2dec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 67754f21a2..1ee6a0f6e4 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -376,6 +376,10 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) int size[3] = { 0 }, ret[3] = { 0 }; AVIOContext *f[3] = { NULL }; AVCodecContext *codec = s1->streams[0]->codec; + AVOpenCallback open_func = s1->open_cb; + + if (!open_func) + open_func = ffio_open2_wrapper; if (!s->is_pipe) { /* loop over input */ @@ -397,7 +401,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) return AVERROR(EIO); } for (i = 0; i < 3; i++) { - if (avio_open2(&f[i], filename, AVIO_FLAG_READ, + if (open_func(s1, &f[i], filename, AVIO_FLAG_READ, &s1->interrupt_callback, NULL) < 0) { if (i >= 1) break; |