[FFmpeg-devel] [PATCH] avformat/takdec: Simplify data->hex conversion

Andreas Rheinhardt andreas.rheinhardt at outlook.com
Sun Dec 5 13:39:02 EET 2021


Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavformat/takdec.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/libavformat/takdec.c b/libavformat/takdec.c
> index 839e3cc781..6bb26683b4 100644
> --- a/libavformat/takdec.c
> +++ b/libavformat/takdec.c
> @@ -109,7 +109,7 @@ static int tak_read_header(AVFormatContext *s)
>              break;
>          case TAK_METADATA_MD5: {
>              uint8_t md5[16];
> -            int i;
> +            char md5_hex[2 * sizeof(md5) + 1];
>  
>              if (size != 19)
>                  return AVERROR_INVALIDDATA;
> @@ -121,10 +121,9 @@ static int tak_read_header(AVFormatContext *s)
>                      return AVERROR_INVALIDDATA;
>              }
>  
> -            av_log(s, AV_LOG_VERBOSE, "MD5=");
> -            for (i = 0; i < 16; i++)
> -                av_log(s, AV_LOG_VERBOSE, "%02x", md5[i]);
> -            av_log(s, AV_LOG_VERBOSE, "\n");
> +            ff_data_to_hex(md5_hex, md5, sizeof(md5), 1);
> +            md5_hex[2 * sizeof(md5)] = '\0';
> +            av_log(s, AV_LOG_VERBOSE, "MD5=%s\n", md5_hex);
>              break;
>          }
>          case TAK_METADATA_END: {
> 
Will apply tonight unless there are objections.

- Andreas


More information about the ffmpeg-devel mailing list