Commit b750b67d authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/img2dec: Use AVOpenCallback

Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 2cb8edea
...@@ -377,6 +377,10 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -377,6 +377,10 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
int size[3] = { 0 }, ret[3] = { 0 }; int size[3] = { 0 }, ret[3] = { 0 };
AVIOContext *f[3] = { NULL }; AVIOContext *f[3] = { NULL };
AVCodecContext *codec = s1->streams[0]->codec; AVCodecContext *codec = s1->streams[0]->codec;
AVOpenCallback open_func = s1->open_cb;
if (!open_func)
open_func = ffio_open2_wrapper;
if (!s->is_pipe) { if (!s->is_pipe) {
/* loop over input */ /* loop over input */
...@@ -403,7 +407,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) ...@@ -403,7 +407,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
!s->loop && !s->loop &&
!s->split_planes) { !s->split_planes) {
f[i] = s1->pb; f[i] = s1->pb;
} else if (avio_open2(&f[i], filename, AVIO_FLAG_READ, } else if (open_func(s1, &f[i], filename, AVIO_FLAG_READ,
&s1->interrupt_callback, NULL) < 0) { &s1->interrupt_callback, NULL) < 0) {
if (i >= 1) if (i >= 1)
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment