cosmetics

[ffmpeg] / libavformat / psxstr.c

diff --git a/libavformat/psxstr.c b/libavformat/psxstr.c
index ce54fb1a0e0c14e20bb3144cd2c375a295461d00..3d4cac7f826c1e3096d8cba91a7e02069614a298 100644 (file)
--- a/libavformat/psxstr.c
+++ b/libavformat/psxstr.c
@@ -125,7 +125,7 @@ static void dump(unsigned char *buf,size_t len)
 static int str_read_header(AVFormatContext *s,
                            AVFormatParameters *ap)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     StrDemuxContext *str = s->priv_data;
     AVStream *st;
     unsigned char sector[RAW_CD_SECTOR_SIZE];
@@ -142,7 +142,7 @@ static int str_read_header(AVFormatContext *s,
 
     /* skip over any RIFF header */
     if (get_buffer(pb, sector, RIFF_HEADER_SIZE) != RIFF_HEADER_SIZE)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     if (AV_RL32(&sector[0]) == RIFF_TAG)
         start = RIFF_HEADER_SIZE;
     else
@@ -153,7 +153,7 @@ static int str_read_header(AVFormatContext *s,
     /* check through the first 32 sectors for individual channels */
     for (i = 0; i < 32; i++) {
         if (get_buffer(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
 //printf("%02x %02x %02x %02x\n",sector[0x10],sector[0x11],sector[0x12],sector[0x13]);
 
@@ -249,7 +249,7 @@ if (str->audio_channel != -1)
 static int str_read_packet(AVFormatContext *s,
                            AVPacket *ret_pkt)
 {
-    ByteIOContext *pb = &s->pb;
+    ByteIOContext *pb = s->pb;
     StrDemuxContext *str = s->priv_data;
     unsigned char sector[RAW_CD_SECTOR_SIZE];
     int channel;
@@ -260,7 +260,7 @@ static int str_read_packet(AVFormatContext *s,
     while (!packet_read) {
 
         if (get_buffer(pb, sector, RAW_CD_SECTOR_SIZE) != RAW_CD_SECTOR_SIZE)
-            return AVERROR_IO;
+            return AVERROR(EIO);
 
         channel = sector[0x11];
         if (channel >= 32)
@@ -282,7 +282,7 @@ static int str_read_packet(AVFormatContext *s,
                 pkt = &str->tmp_pkt;
                 if (current_sector == 0) {
                     if (av_new_packet(pkt, frame_size))
-                        return AVERROR_IO;
+                        return AVERROR(EIO);
 
                     pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
                     pkt->stream_index =
@@ -319,7 +319,7 @@ printf (" dropping audio sector\n");
             if (channel == str->audio_channel) {
                 pkt = ret_pkt;
                 if (av_new_packet(pkt, 2304))
-                    return AVERROR_IO;
+                    return AVERROR(EIO);
                 memcpy(pkt->data,sector+24,2304);
 
                 pkt->stream_index =
@@ -338,7 +338,7 @@ printf (" dropping other sector\n");
         }
 
         if (url_feof(pb))
-            return AVERROR_IO;
+            return AVERROR(EIO);
     }
 
     return ret;