Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56'

[ffmpeg] / libavformat / amr.c

diff --git a/libavformat/amr.c b/libavformat/amr.c
index 59963e14b890b01e5eda2939ac1498b20ccf6685..b5194a2d9e3a7cf0d576f31507bb14774e099569 100644 (file)
--- a/libavformat/amr.c
+++ b/libavformat/amr.c
@@ -118,7 +118,7 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
     AMRContext *amr = s->priv_data;
 
     if (avio_feof(s->pb)) {
-        return AVERROR(EIO);
+        return AVERROR_EOF;
     }
 
     // FIXME this is wrong, this should rather be in an AVParser
@@ -156,6 +156,8 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt)
 
     if (read != size - 1) {
         av_packet_unref(pkt);
+        if (read < 0)
+            return read;
         return AVERROR(EIO);
     }