[FFmpeg-cvslog] electronicarts: Let functions always returning the same value return void

[Alexander Strasser]

Hi all,

  I hope it is not too annoying, but I do *not* plan to keep quiet
when I see things like this!

On 2013-08-16 12:31 +0200, Diego Biurrun wrote:
> ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Aug 14 18:04:36 2013 +0200| [163a729725c6eb0081b0af41a7279f7d19aee86e] | committer: Diego Biurrun
> 
> electronicarts: Let functions always returning the same value return void

  The comments that were removed before this patch, clearly indicated
a system the original author of the code had in mind.

  As far as I can see, this patch fixes nothing and to me even makes
the code structurally less clear.

  I would like to see the comments restored and this commit reverted.
What do others think?

  You might argue that this is a rather unimportant format to many
people. Still I would say code quality should be kept as high as
possible across the whole code base. People will search the whole
code base when looking for how to implement new modules and features.

  Alexander

> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=163a729725c6eb0081b0af41a7279f7d19aee86e
> ---
> 
>  libavformat/electronicarts.c |   30 ++++++++++--------------------
>  1 file changed, 10 insertions(+), 20 deletions(-)
> 
> diff --git a/libavformat/electronicarts.c b/libavformat/electronicarts.c
> index 3828551..e764bd9 100644
> --- a/libavformat/electronicarts.c
> +++ b/libavformat/electronicarts.c
> @@ -245,7 +245,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;
> @@ -280,11 +280,9 @@ static int process_audio_header_eacs(AVFormatContext *s)
>                 "unsupported stream type; audio compression_type=%i\n",
>                 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;
> @@ -293,11 +291,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;
> @@ -306,11 +302,9 @@ 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)
> +static void process_video_header_vp6(AVFormatContext *s)
>  {
>      EaDemuxContext *ea = s->priv_data;
>      AVIOContext *pb    = s->pb;
> @@ -319,11 +313,9 @@ static int process_video_header_vp6(AVFormatContext *s)
>      ea->time_base.den = avio_rl32(pb);
>      ea->time_base.num = avio_rl32(pb);
>      ea->video_codec   = AV_CODEC_ID_VP6;
> -
> -    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;
> @@ -333,8 +325,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.
> @@ -363,7 +353,7 @@ static int process_ea_header(AVFormatContext *s)
>                  av_log(s, AV_LOG_ERROR, "unknown 1SNh headerid\n");
>                  return 0;
>              }
> -            err = process_audio_header_eacs(s);
> +            process_audio_header_eacs(s);
>              break;
>  
>          case SCHl_TAG:
> @@ -379,11 +369,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:
> @@ -392,7 +382,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:
> @@ -413,7 +403,7 @@ static int process_ea_header(AVFormatContext *s)
>              break;
>  
>          case MVhd_TAG:
> -            err = process_video_header_vp6(s);
> +            process_video_header_vp6(s);
>              break;
>          }
>  
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20130817/07e17e65/attachment.asc>