@@ -2874,7 +2874,7 @@ for thread in $THREADS_LIST; do

     fi

 done

-check_lib math.h sin -lm

+check_lib math.h sin -lm && LIBM="-lm"

 disabled crystalhd || check_lib libcrystalhd/libcrystalhd_if.h DtsCrystalHDVersion -lcrystalhd || disable crystalhd

 enabled vaapi && require vaapi va/va.h vaInitialize -lva

@@ -3485,10 +3485,10 @@ Cflags: -I\${includedir}

 EOF

 }

-pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION"

-pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs"

+pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM"

+pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs $LIBM" "libavutil = $LIBAVUTIL_VERSION"

 pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION"

 pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "libavformat = $LIBAVFORMAT_VERSION"

 pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs"

-pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION"

-pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"

+pkgconfig_generate libpostproc "FFmpeg post processing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION"

+pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION"

@@ -539,7 +539,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)

             rangemax = (1 << rangebits);

             if (rangemax > vc->blocksize[1] / 2) {

                 av_log(vc->avccontext, AV_LOG_ERROR,

-                       "Floor value is too large for blocksize: %d (%d)\n",

+                       "Floor value is too large for blocksize: %"PRIuFAST32" (%"PRIuFAST32")\n",

                        rangemax, vc->blocksize[1] / 2);

                 return -1;

             }

@@ -505,7 +505,9 @@ static int applehttp_read_header(AVFormatContext *s, AVFormatParameters *ap)

                 goto fail;

             }

             avcodec_copy_context(st->codec, v->ctx->streams[j]->codec);

-            av_metadata_set2(&st->metadata, "variant_bitrate", bitrate_str, 0);

+            if (v->bandwidth)

+                av_metadata_set2(&st->metadata, "variant_bitrate", bitrate_str,

+                                 0);

         }

         stream_offset += v->ctx->nb_streams;

     }

@@ -153,9 +153,9 @@ static int crypto_close(URLContext *h)

     CryptoContext *c = h->priv_data;

     if (c->hd)

         ffurl_close(c->hd);

-    av_free(c->aes);

-    av_free(c->key);

-    av_free(c->iv);

+    av_freep(&c->aes);

+    av_freep(&c->key);

+    av_freep(&c->iv);

     return 0;

 }

@@ -243,14 +243,14 @@ ogg_read_page (AVFormatContext * s, int *str)

     idx = ogg_find_stream (ogg, serial);

     if (idx < 0){

         if (ogg->headers) {

-                int n;

+            int n;

-                for (n = 0; n < ogg->nstreams; n++) {

-                    av_freep(&ogg->streams[n].buf);

-                    av_freep(&ogg->streams[n].private);

-                }

-                ogg->curidx   = -1;

-                ogg->nstreams = 0;

+            for (n = 0; n < ogg->nstreams; n++) {

+                av_freep(&ogg->streams[n].buf);

+                av_freep(&ogg->streams[n].private);

+            }

+            ogg->curidx   = -1;

+            ogg->nstreams = 0;

         }

         idx = ogg_new_stream (s, serial);

         if (idx < 0)