LAV
/
FFmpeg
1
0
Fork 0
Code

HACK: make the image2pipe demuxer work more like we want it to.

This commit is contained in:
Hendrik Leppkes 2012-10-25 18:01:02 +02:00
parent d97f6e7972
commit 8a33eb3ef2
Signed by: hendrik
GPG Key ID: 846079A4B0A7C1B5
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/img2dec.c
View File

@ -492,7 +492,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt)
} else if (!ffstream(s1->streams[0])->parser) {
size[0] = avio_size(s1->pb);
} 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) {
res = ret[0];
} else if (ret[1] < 0) {
res = ret[1];
} else if (ret[2] < 0) {
res = ret[2];
} else {
res = AVERROR_EOF;
}
res = AVERROR_EOF;
goto fail;
} else {
s->img_count++;