[FFmpeg-devel] [PATCH] avformat/crypto.c: remove unnecessary code

Tomas Härdin tjoppen at acc.umu.se
Mon Jul 13 21:45:38 EEST 2020


lör 2020-07-11 klockan 16:04 +0800 skrev Steven Liu:
> Because the newpos variable is set value before use it.
> The newpos variable declared at the head partition of crypto_seek.
> 
> Signed-off-by: Steven Liu <lq at chinaffmpeg.org>
> ---
>  libavformat/crypto.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
> 
> diff --git a/libavformat/crypto.c b/libavformat/crypto.c
> index 31f9ac0ab9..daa29ed501 100644
> --- a/libavformat/crypto.c
> +++ b/libavformat/crypto.c
> @@ -252,21 +252,18 @@ static int64_t crypto_seek(URLContext *h, int64_t pos, int whence)
>      case SEEK_CUR:
>          pos = pos + c->position;
>          break;
> -    case SEEK_END: {
> -        int64_t newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE );
> +    case SEEK_END:
> +        newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE );

Make me wonder why this was declared like this in the first place.
Maybe move the definition of the newpos in the outer scope to where
it's used instead? FFmpeg is C99 now so that should be fine.

>          if (newpos < 0) {
>              av_log(h, AV_LOG_ERROR,
>                  "Crypto: seek_end - can't get file size (pos=%lld)\r\n", (long long int)pos);
>              return newpos;
>          }
>          pos = newpos - pos;
> -        }
>          break;
> -    case AVSEEK_SIZE: {
> -        int64_t newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE );
> +    case AVSEEK_SIZE:
> +        newpos = ffurl_seek( c->hd, pos, AVSEEK_SIZE );
>          return newpos;

Why not just return ffurl_seek()?

/Tomas



More information about the ffmpeg-devel mailing list