Bump versions after 6.1

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
doc/APIchanges: Add 6.1 cut point
2025-12-11 17:30:00 +01:00 · 2023-10-29 16:19:14 +01:00 · 2023-10-29 16:19:14 +01:00 · 2023-10-29 15:34:05 +01:00 · 2023-10-29 13:58:52 +08:00 · 2023-10-29 13:58:30 +08:00
11 changed files with 43 additions and 29 deletions
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -2,6 +2,8 @@ The last version increases of all libraries were on 2023-02-09

 API changes, most recent first:

+-------- 8< --------- FFmpeg 6.1 was cut here -------- 8< ---------
+
 2023-10-27 - xxxxxxxxxx - lavu 58.28.100 - channel_layout.h
  Add AV_CH_LAYOUT_3POINT1POINT2 and AV_CHANNEL_LAYOUT_3POINT1POINT2.
  Add AV_CH_LAYOUT_5POINT1POINT2_BACK and AV_CHANNEL_LAYOUT_5POINT1POINT2_BACK.
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,8 +29,8 @@

 #include "version_major.h"

-#define LIBAVCODEC_VERSION_MINOR  30
-#define LIBAVCODEC_VERSION_MICRO 102
+#define LIBAVCODEC_VERSION_MINOR  32
+#define LIBAVCODEC_VERSION_MICRO 100

 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                               LIBAVCODEC_VERSION_MINOR, \
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -29,8 +29,8 @@

 #include "version_major.h"

-#define LIBAVDEVICE_VERSION_MINOR   2
-#define LIBAVDEVICE_VERSION_MICRO 101
+#define LIBAVDEVICE_VERSION_MINOR   4
+#define LIBAVDEVICE_VERSION_MICRO 100

 #define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
                                               LIBAVDEVICE_VERSION_MINOR, \
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@

 #include "version_major.h"

-#define LIBAVFILTER_VERSION_MINOR  11
+#define LIBAVFILTER_VERSION_MINOR  13
 #define LIBAVFILTER_VERSION_MICRO 100


--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,8 +31,8 @@

 #include "version_major.h"

-#define LIBAVFORMAT_VERSION_MINOR  15
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MINOR  17
+#define LIBAVFORMAT_VERSION_MICRO 100

 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                               LIBAVFORMAT_VERSION_MINOR, \
--- a/libavutil/hwcontext_vaapi.c
+++ b/libavutil/hwcontext_vaapi.c
@@ -217,7 +217,7 @@ static int vaapi_get_image_format(AVHWDeviceContext *hwdev,
            return 0;
        }
    }
-    return AVERROR(EINVAL);
+    return AVERROR(ENOSYS);
 }

 static int vaapi_frames_get_constraints(AVHWDeviceContext *hwdev,
@@ -817,7 +817,7 @@ static int vaapi_map_frame(AVHWFramesContext *hwfc,
    err = vaapi_get_image_format(hwfc->device_ctx, dst->format, &image_format);
    if (err < 0) {
        // Requested format is not a valid output format.
-        return AVERROR(EINVAL);
+        return err;
    }

    map = av_malloc(sizeof(*map));
@@ -992,7 +992,7 @@ static int vaapi_map_to_memory(AVHWFramesContext *hwfc, AVFrame *dst,
    if (dst->format != AV_PIX_FMT_NONE) {
        err = vaapi_get_image_format(hwfc->device_ctx, dst->format, NULL);
        if (err < 0)
-            return AVERROR(ENOSYS);
+            return err;
    }

    err = vaapi_map_frame(hwfc, dst, src, flags);
--- a/libavutil/hwcontext_vulkan.c
+++ b/libavutil/hwcontext_vulkan.c
@@ -1164,6 +1164,11 @@ static int setup_queue_families(AVHWDeviceContext *ctx, VkDeviceCreateInfo *cd)
    return 0;
 }

+/* Only resources created by vulkan_device_create should be released here,
+ * resources created by vulkan_device_init should be released by
+ * vulkan_device_uninit, to make sure we don't free user provided resources,
+ * and there is no leak.
+ */
 static void vulkan_device_free(AVHWDeviceContext *ctx)
 {
    VulkanDevicePriv *p = ctx->internal->priv;
@@ -1183,15 +1188,20 @@ static void vulkan_device_free(AVHWDeviceContext *ctx)
    if (p->libvulkan)
        dlclose(p->libvulkan);

+    RELEASE_PROPS(hwctx->enabled_inst_extensions, hwctx->nb_enabled_inst_extensions);
+    RELEASE_PROPS(hwctx->enabled_dev_extensions, hwctx->nb_enabled_dev_extensions);
+}
+
+static void vulkan_device_uninit(AVHWDeviceContext *ctx)
+{
+    VulkanDevicePriv *p = ctx->internal->priv;
+
    for (uint32_t i = 0; i < p->nb_tot_qfs; i++) {
        pthread_mutex_destroy(p->qf_mutex[i]);
        av_freep(&p->qf_mutex[i]);
    }
    av_freep(&p->qf_mutex);

-    RELEASE_PROPS(hwctx->enabled_inst_extensions, hwctx->nb_enabled_inst_extensions);
-    RELEASE_PROPS(hwctx->enabled_dev_extensions, hwctx->nb_enabled_dev_extensions);
-
    ff_vk_uninit(&p->vkctx);
 }

@@ -1654,11 +1664,6 @@ static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx,
                                    NULL, NULL, NULL, NULL, 0, 0) >= 0;
    }

-#if CONFIG_CUDA
-    if (p->dev_is_nvidia)
-        count++;
-#endif
-
    constraints->valid_sw_formats = av_malloc_array(count + 1,
                                                    sizeof(enum AVPixelFormat));
    if (!constraints->valid_sw_formats)
@@ -1674,10 +1679,6 @@ static int vulkan_frames_get_constraints(AVHWDeviceContext *ctx,
        }
    }

-#if CONFIG_CUDA
-    if (p->dev_is_nvidia)
-        constraints->valid_sw_formats[count++] = AV_PIX_FMT_CUDA;
-#endif
    constraints->valid_sw_formats[count++] = AV_PIX_FMT_NONE;

    constraints->min_width  = 1;
@@ -2406,12 +2407,22 @@ static int vulkan_transfer_get_formats(AVHWFramesContext *hwfc,
                                       enum AVHWFrameTransferDirection dir,
                                       enum AVPixelFormat **formats)
 {
-    enum AVPixelFormat *fmts = av_malloc_array(2, sizeof(*fmts));
+    enum AVPixelFormat *fmts;
+    int n = 2;
+
+#if CONFIG_CUDA
+    n++;
+#endif
+    fmts = av_malloc_array(n, sizeof(*fmts));
    if (!fmts)
        return AVERROR(ENOMEM);

-    fmts[0] = hwfc->sw_format;
-    fmts[1] = AV_PIX_FMT_NONE;
+    n = 0;
+    fmts[n++] = hwfc->sw_format;
+#if CONFIG_CUDA
+    fmts[n++] = AV_PIX_FMT_CUDA;
+#endif
+    fmts[n++] = AV_PIX_FMT_NONE;

    *formats = fmts;
    return 0;
@@ -3702,6 +3713,7 @@ const HWContextType ff_hwcontext_type_vulkan = {
    .frames_priv_size       = sizeof(VulkanFramesPriv),

    .device_init            = &vulkan_device_init,
+    .device_uninit          = &vulkan_device_uninit,
    .device_create          = &vulkan_device_create,
    .device_derive          = &vulkan_device_derive,

--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,7 +79,7 @@
 */

 #define LIBAVUTIL_VERSION_MAJOR  58
-#define LIBAVUTIL_VERSION_MINOR  28
+#define LIBAVUTIL_VERSION_MINOR  30
 #define LIBAVUTIL_VERSION_MICRO 100

 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -30,7 +30,7 @@

 #include "version_major.h"

-#define LIBPOSTPROC_VERSION_MINOR   2
+#define LIBPOSTPROC_VERSION_MINOR   4
 #define LIBPOSTPROC_VERSION_MICRO 100

 #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -30,7 +30,7 @@

 #include "version_major.h"

-#define LIBSWRESAMPLE_VERSION_MINOR  11
+#define LIBSWRESAMPLE_VERSION_MINOR  13
 #define LIBSWRESAMPLE_VERSION_MICRO 100

 #define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -28,7 +28,7 @@

 #include "version_major.h"

-#define LIBSWSCALE_VERSION_MINOR   4
+#define LIBSWSCALE_VERSION_MINOR   6
 #define LIBSWSCALE_VERSION_MICRO 100

 #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
Author	SHA1	Message	Date
Michael Niedermayer	47e784f881	Bump versions after 6.1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2023-10-29 16:19:14 +01:00
Michael Niedermayer	0e15b2b828	doc/APIchanges: Add 6.1 cut point Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2023-10-29 16:19:14 +01:00
Michael Niedermayer	9d3a7d30c4	Bump versions prior to 6.1 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>	2023-10-29 15:34:05 +01:00
Zhao Zhili	105657540b	avutil/hwcontext_vaapi: return ENOSYS for unsupported operation av_hwframe_transfer_data try with src_ctx first. If the operation failed with AVERROR(ENOSYS), it will try again with dst_ctx. Return AVERROR(EINVAL) makes the second step being skipped. Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>	2023-10-29 13:58:52 +08:00
Zhao Zhili	63078b4599	avutil/hwcontext_vulkan: cuda doesn't belong to valid_sw_formats Move it to transfer_get_formats. Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>	2023-10-29 13:58:30 +08:00
Zhao Zhili	891f70c6d5	avutil/hwcontext_vulkan: fix memleak when device_create is skipped Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>	2023-10-29 13:57:43 +08:00