HACK: make the image2pipe demuxer work more like we want it to.
This commit is contained in:
parent
d97f6e7972
commit
8a33eb3ef2
|
@ -492,7 +492,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
|
||||||
} else if (!ffstream(s1->streams[0])->parser) {
|
} else if (!ffstream(s1->streams[0])->parser) {
|
||||||
size[0] = avio_size(s1->pb);
|
size[0] = avio_size(s1->pb);
|
||||||
} else {
|
} else {
|
||||||
size[0] = 4096;
|
size[0]= avio_size(f[0]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -550,15 +550,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ret[0] <= 0 || ret[1] < 0 || ret[2] < 0) {
|
if (ret[0] <= 0 || ret[1] < 0 || ret[2] < 0) {
|
||||||
if (ret[0] < 0) {
|
res = AVERROR_EOF;
|
||||||
res = ret[0];
|
|
||||||
} else if (ret[1] < 0) {
|
|
||||||
res = ret[1];
|
|
||||||
} else if (ret[2] < 0) {
|
|
||||||
res = ret[2];
|
|
||||||
} else {
|
|
||||||
res = AVERROR_EOF;
|
|
||||||
}
|
|
||||||
goto fail;
|
goto fail;
|
||||||
} else {
|
} else {
|
||||||
s->img_count++;
|
s->img_count++;
|
||||||
|
|
Loading…
Reference in New Issue