[FFmpeg-devel] [PATCH] avcodec/vc1dec: Fix vc1_hwaccel_pixfmt_list_420
Akihiko Odaki
akihiko.odaki at gmail.com
Sun Feb 11 09:28:55 EET 2024
vc1_hwaccel_pixfmt_list_420 is referenced even if
!(CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER) so move it out
of the #if block.
Signed-off-by: Akihiko Odaki <akihiko.odaki at gmail.com>
---
libavcodec/vc1dec.c | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index e71b92eef8..3ca478e82a 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -51,27 +51,6 @@
#include "libavutil/thread.h"
-#if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER
-
-typedef struct SpriteData {
- /**
- * Transform coefficients for both sprites in 16.16 fixed point format,
- * in the order they appear in the bitstream:
- * x scale
- * rotation 1 (unused)
- * x offset
- * rotation 2 (unused)
- * y scale
- * y offset
- * alpha
- */
- int coefs[2][7];
-
- int effect_type, effect_flag;
- int effect_pcount1, effect_pcount2; ///< amount of effect parameters stored in effect_params
- int effect_params1[15], effect_params2[10]; ///< effect parameters in 16.16 fixed point format
-} SpriteData;
-
static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {
#if CONFIG_VC1_DXVA2_HWACCEL
AV_PIX_FMT_DXVA2_VLD,
@@ -96,6 +75,27 @@ static const enum AVPixelFormat vc1_hwaccel_pixfmt_list_420[] = {
AV_PIX_FMT_NONE
};
+#if CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER
+
+typedef struct SpriteData {
+ /**
+ * Transform coefficients for both sprites in 16.16 fixed point format,
+ * in the order they appear in the bitstream:
+ * x scale
+ * rotation 1 (unused)
+ * x offset
+ * rotation 2 (unused)
+ * y scale
+ * y offset
+ * alpha
+ */
+ int coefs[2][7];
+
+ int effect_type, effect_flag;
+ int effect_pcount1, effect_pcount2; ///< amount of effect parameters stored in effect_params
+ int effect_params1[15], effect_params2[10]; ///< effect parameters in 16.16 fixed point format
+} SpriteData;
+
static inline int get_fp_val(GetBitContext* gb)
{
return (get_bits_long(gb, 30) - (1 << 29)) << 1;
---
base-commit: 81c2557691b12ceb79b3ba92aa496f2301ab4d18
change-id: 20240210-vc1dec-dc6d7b31f795
Best regards,
--
Akihiko Odaki <akihiko.odaki at gmail.com>
More information about the ffmpeg-devel
mailing list