Fix compile on Darwin (FATE). Compile error:

[ffmpeg] / libavformat / xa.c

diff --git a/libavformat/xa.c b/libavformat/xa.c
index fedc2f202e144563587093a441979b3475104624..3a866b992fece39005a83287b8a874e7f0612978 100644 (file)
--- a/libavformat/xa.c
+++ b/libavformat/xa.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavformat/xa.c
+ * @file
  * Maxis XA File Demuxer
  * by Robert Marston (rmarston@gmail.com)
  * for more information on the XA audio format see
@@ -74,7 +74,7 @@ static int xa_read_header(AVFormatContext *s,
     if (!st)
         return AVERROR(ENOMEM);
 
-    st->codec->codec_type   = CODEC_TYPE_AUDIO;
+    st->codec->codec_type   = AVMEDIA_TYPE_AUDIO;
     st->codec->codec_id     = CODEC_ID_ADPCM_EA_MAXIS_XA;
     url_fskip(pb, 4);       /* Skip the XA ID */
     xa->out_size            =  get_le32(pb);
@@ -106,8 +106,8 @@ static int xa_read_packet(AVFormatContext *s,
     packet_size = 15*st->codec->channels;
 
     ret = av_get_packet(pb, pkt, packet_size);
-    if(ret != packet_size)
-        return AVERROR(EIO);
+    if(ret < 0)
+        return ret;
 
     pkt->stream_index = st->index;
     xa->sent_bytes += packet_size;