1 files changed, 20 insertions, 20 deletions

diff --git a/contrib/ffmpeg/libavformat/westwood.c b/contrib/ffmpeg/libavformat/westwood.c
index bed2f0d14..268f2e71e 100644
--- a/contrib/ffmpeg/libavformat/westwood.c
+++ b/contrib/ffmpeg/libavformat/westwood.c
@@ -117,13 +117,13 @@ static int wsaud_probe(AVProbeData *p)
 static int wsaud_read_header(AVFormatContext *s,
                              AVFormatParameters *ap)
 {
-    WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsAudDemuxContext *wsaud = s->priv_data;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
     unsigned char header[AUD_HEADER_SIZE];
 
     if (get_buffer(pb, header, AUD_HEADER_SIZE) != AUD_HEADER_SIZE)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     wsaud->audio_samplerate = AV_RL16(&header[0]);
     if (header[11] == 99)
         wsaud->audio_type = CODEC_ID_ADPCM_IMA_WS;
@@ -138,7 +138,7 @@ static int wsaud_read_header(AVFormatContext *s,
     /* initialize the audio decoder stream */
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     av_set_pts_info(st, 33, 1, wsaud->audio_samplerate);
     st->codec->codec_type = CODEC_TYPE_AUDIO;
     st->codec->codec_id = wsaud->audio_type;
@@ -159,15 +159,15 @@ static int wsaud_read_header(AVFormatContext *s,
 static int wsaud_read_packet(AVFormatContext *s,
                              AVPacket *pkt)
 {
-    WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsAudDemuxContext *wsaud = s->priv_data;
+    ByteIOContext *pb = s->pb;
     unsigned char preamble[AUD_CHUNK_PREAMBLE_SIZE];
     unsigned int chunk_size;
     int ret = 0;
 
     if (get_buffer(pb, preamble, AUD_CHUNK_PREAMBLE_SIZE) !=
         AUD_CHUNK_PREAMBLE_SIZE)
-        return AVERROR_IO;
+        return AVERROR(EIO);
 
     /* validate the chunk */
     if (AV_RL32(&preamble[4]) != AUD_CHUNK_SIGNATURE)
@@ -176,7 +176,7 @@ static int wsaud_read_packet(AVFormatContext *s,
     chunk_size = AV_RL16(&preamble[0]);
     ret= av_get_packet(pb, pkt, chunk_size);
     if (ret != chunk_size)
-        return AVERROR_IO;
+        return AVERROR(EIO);
     pkt->stream_index = wsaud->audio_stream_index;
     pkt->pts = wsaud->audio_frame_counter;
     pkt->pts /= wsaud->audio_samplerate;
@@ -189,7 +189,7 @@ static int wsaud_read_packet(AVFormatContext *s,
 
 static int wsaud_read_close(AVFormatContext *s)
 {
-//    WsAudDemuxContext *wsaud = (WsAudDemuxContext *)s->priv_data;
+//    WsAudDemuxContext *wsaud = s->priv_data;
 
     return 0;
 }
@@ -212,8 +212,8 @@ static int wsvqa_probe(AVProbeData *p)
 static int wsvqa_read_header(AVFormatContext *s,
                              AVFormatParameters *ap)
 {
-    WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsVqaDemuxContext *wsvqa = s->priv_data;
+    ByteIOContext *pb = s->pb;
     AVStream *st;
     unsigned char *header;
     unsigned char scratch[VQA_PREAMBLE_SIZE];
@@ -223,7 +223,7 @@ static int wsvqa_read_header(AVFormatContext *s,
     /* initialize the video decoder stream */
     st = av_new_stream(s, 0);
     if (!st)
-        return AVERROR_NOMEM;
+        return AVERROR(ENOMEM);
     av_set_pts_info(st, 33, 1, VQA_FRAMERATE);
     wsvqa->video_stream_index = st->index;
     st->codec->codec_type = CODEC_TYPE_VIDEO;
@@ -240,7 +240,7 @@ static int wsvqa_read_header(AVFormatContext *s,
     if (get_buffer(pb, st->codec->extradata, VQA_HEADER_SIZE) !=
         VQA_HEADER_SIZE) {
         av_free(st->codec->extradata);
-        return AVERROR_IO;
+        return AVERROR(EIO);
     }
     st->codec->width = AV_RL16(&header[6]);
     st->codec->height = AV_RL16(&header[8]);
@@ -249,7 +249,7 @@ static int wsvqa_read_header(AVFormatContext *s,
     if (AV_RL16(&header[24]) || (AV_RL16(&header[0]) == 1 && AV_RL16(&header[2]) == 1)) {
         st = av_new_stream(s, 0);
         if (!st)
-            return AVERROR_NOMEM;
+            return AVERROR(ENOMEM);
         av_set_pts_info(st, 33, 1, VQA_FRAMERATE);
         st->codec->codec_type = CODEC_TYPE_AUDIO;
         if (AV_RL16(&header[0]) == 1)
@@ -279,7 +279,7 @@ static int wsvqa_read_header(AVFormatContext *s,
     do {
         if (get_buffer(pb, scratch, VQA_PREAMBLE_SIZE) != VQA_PREAMBLE_SIZE) {
             av_free(st->codec->extradata);
-            return AVERROR_IO;
+            return AVERROR(EIO);
         }
         chunk_tag = AV_RB32(&scratch[0]);
         chunk_size = AV_RB32(&scratch[4]);
@@ -314,8 +314,8 @@ static int wsvqa_read_header(AVFormatContext *s,
 static int wsvqa_read_packet(AVFormatContext *s,
                              AVPacket *pkt)
 {
-    WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data;
-    ByteIOContext *pb = &s->pb;
+    WsVqaDemuxContext *wsvqa = s->priv_data;
+    ByteIOContext *pb = s->pb;
     int ret = -1;
     unsigned char preamble[VQA_PREAMBLE_SIZE];
     unsigned int chunk_type;
@@ -330,11 +330,11 @@ static int wsvqa_read_packet(AVFormatContext *s,
         if ((chunk_type == SND1_TAG) || (chunk_type == SND2_TAG) || (chunk_type == VQFR_TAG)) {
 
             if (av_new_packet(pkt, chunk_size))
-                return AVERROR_IO;
+                return AVERROR(EIO);
             ret = get_buffer(pb, pkt->data, chunk_size);
             if (ret != chunk_size) {
                 av_free_packet(pkt);
-                return AVERROR_IO;
+                return AVERROR(EIO);
             }
 
             if (chunk_type == SND2_TAG) {
@@ -371,7 +371,7 @@ static int wsvqa_read_packet(AVFormatContext *s,
 
 static int wsvqa_read_close(AVFormatContext *s)
 {
-//    WsVqaDemuxContext *wsvqa = (WsVqaDemuxContext *)s->priv_data;
+//    WsVqaDemuxContext *wsvqa = s->priv_data;
 
     return 0;
 }