Merge commit '163a7297'

* commit '163a7297':
  electronicarts: Let functions always returning the same value return void
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavformat/electronicarts.c

@@ -251,7 +251,7 @@ static int process_audio_header_elements(AVFormatContext *s)
     return 1;
 }
 
-static int process_audio_header_eacs(AVFormatContext *s)
+static void process_audio_header_eacs(AVFormatContext *s)
 {
     EaDemuxContext *ea = s->priv_data;
     AVIOContext *pb    = s->pb;
@@ -286,11 +286,9 @@ static int process_audio_header_eacs(AVFormatContext *s)
                               "stream type; audio compression_type=%i",
                               compression_type);
     }
-
-    return 1;
 }
 
-static int process_audio_header_sead(AVFormatContext *s)
+static void process_audio_header_sead(AVFormatContext *s)
 {
     EaDemuxContext *ea = s->priv_data;
     AVIOContext *pb    = s->pb;
@@ -299,11 +297,9 @@ static int process_audio_header_sead(AVFormatContext *s)
     ea->bytes        = avio_rl32(pb);  /* 1=8-bit, 2=16-bit */
     ea->num_channels = avio_rl32(pb);
     ea->audio_codec  = AV_CODEC_ID_ADPCM_IMA_EA_SEAD;
-
-    return 1;
 }
 
-static int process_video_header_mdec(AVFormatContext *s)
+static void process_video_header_mdec(AVFormatContext *s)
 {
     EaDemuxContext *ea = s->priv_data;
     AVIOContext *pb    = s->pb;
@@ -312,8 +308,6 @@ static int process_video_header_mdec(AVFormatContext *s)
     ea->height      = avio_rl16(pb);
     ea->time_base   = (AVRational) { 1, 15 };
     ea->video_codec = AV_CODEC_ID_MDEC;
-
-    return 1;
 }
 
 static int process_video_header_vp6(AVFormatContext *s)
@@ -335,7 +329,7 @@ static int process_video_header_vp6(AVFormatContext *s)
     return 1;
 }
 
-static int process_video_header_cmv(AVFormatContext *s)
+static void process_video_header_cmv(AVFormatContext *s)
 {
     EaDemuxContext *ea = s->priv_data;
     int fps;
@@ -345,8 +339,6 @@ static int process_video_header_cmv(AVFormatContext *s)
     if (fps)
         ea->time_base = (AVRational) { 1, fps };
     ea->video_codec = AV_CODEC_ID_CMV;
-
-    return 0;
 }
 
 /* Process EA file header.
@@ -375,7 +367,7 @@ static int process_ea_header(AVFormatContext *s)
                 avpriv_request_sample(s, "unknown 1SNh headerid");
                 return 0;
             }
-            err = process_audio_header_eacs(s);
+            process_audio_header_eacs(s);
             break;
 
         case SCHl_TAG:
@@ -391,11 +383,11 @@ static int process_ea_header(AVFormatContext *s)
             break;
 
         case SEAD_TAG:
-            err = process_audio_header_sead(s);
+            process_audio_header_sead(s);
             break;
 
         case MVIh_TAG:
-            err = process_video_header_cmv(s);
+            process_video_header_cmv(s);
             break;
 
         case kVGT_TAG:
@@ -403,7 +395,7 @@ static int process_ea_header(AVFormatContext *s)
             break;
 
         case mTCD_TAG:
-            err = process_video_header_mdec(s);
+            process_video_header_mdec(s);
             break;
 
         case MPCh_TAG: