Fixes Bug 373.
Unified · Split
| @@ -367,7 +367,7 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) · 366 unmodified lines | ||
| 367 | 367 | { |
| 368 | 368 | int i; |
| 369 | 369 | char header[MAX_FRAME_HEADER+1]; |
| 370 | − int packet_size, width, height; | |
| 370 | + int packet_size, width, height, ret; | |
| 371 | 371 | AVStream *st = s->streams[0]; |
| 372 | 372 | struct frame_attributes *s1 = s->priv_data; |
| 373 | 373 | |
| @@ -378,20 +378,28 @@ static int yuv4_read_packet(AVFormatContext *s, AVPacket *pkt) · 4 unmodified lines | ||
| 378 | 378 | break; |
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | − if (i == MAX_FRAME_HEADER) | |
| 382 | − return -1; | |
| 381 | + if (s->pb->error) | |
| 382 | + return s->pb->error; | |
| 383 | + else if (s->pb->eof_reached) | |
| 384 | + return AVERROR_EOF; | |
| 385 | + else if (i == MAX_FRAME_HEADER) | |
| 386 | + return AVERROR_INVALIDDATA; | |
| 387 | + | |
| 383 | 388 | if (strncmp(header, Y4M_FRAME_MAGIC, strlen(Y4M_FRAME_MAGIC))) |
| 384 | − return -1; | |
| 389 | + return AVERROR_INVALIDDATA; | |
| 385 | 390 | |
| 386 | 391 | width = st->codec->width; |
| 387 | 392 | height = st->codec->height; |
| 388 | 393 | |
| 389 | 394 | packet_size = avpicture_get_size(st->codec->pix_fmt, width, height); |
| 390 | 395 | if (packet_size < 0) |
| 391 | − return -1; | |
| 396 | + return packet_size; | |
| 392 | 397 | |
| 393 | − if (av_get_packet(s->pb, pkt, packet_size) != packet_size) | |
| 394 | − return AVERROR(EIO); | |
| 398 | + ret = av_get_packet(s->pb, pkt, packet_size); | |
| 399 | + if (ret < 0) | |
| 400 | + return ret; | |
| 401 | + else if (ret != packet_size) | |
| 402 | + return s->pb->eof_reached ? AVERROR_EOF : AVERROR(EIO); | |
| 395 | 403 | |
| 396 | 404 | if (st->codec->coded_frame) { |
| 397 | 405 | st->codec->coded_frame->interlaced_frame = s1->interlaced_frame; |