diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-10-25 20:01:02 +0400 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2017-08-04 20:12:11 +0300 |
commit | 000fc35b6c6d44401afd55fa83f2269639a850fb (patch) | |
tree | 22d2d05618b51d30d699a6b3a3bc56464aa1f658 /libavformat | |
parent | 395aeaf9d9f0f3a438e61d839769029eeb539fc7 (diff) |
HACK: make the image2pipe demuxer work more like we want it to.
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/img2dec.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavformat/img2dec.c b/libavformat/img2dec.c index 19cae87fdb..ba47582ea6 100644 --- a/libavformat/img2dec.c +++ b/libavformat/img2dec.c @@ -452,7 +452,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) } else if (!s1->streams[0]->parser) { size[0] = avio_size(s1->pb); } else { - size[0] = 4096; + size[0]= avio_size(f[0]); } } @@ -500,15 +500,7 @@ int ff_img_read_packet(AVFormatContext *s1, AVPacket *pkt) if (ret[0] <= 0 || ret[1] < 0 || ret[2] < 0) { av_packet_unref(pkt); - 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++; |