[FFmpeg-devel] [PATCH 1/2] lavc/intrax8: fix an assert

[FFmpeg-devel] [PATCH 1/2] lavc/intrax8: fix an assert

[Nicolas George]

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavcodec/intrax8.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index e4c8b96c9c..c5c6727282 100644
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -109,7 +109,7 @@ static inline void x8_select_ac_table(IntraX8Context *const w, int mode)
     table_index       = get_bits(w->gb, 3);
     // 2 modes use same tables
     w->j_ac_vlc_table[mode] = j_ac_vlc[w->quant < 13][mode >> 1][table_index].table;
-    av_assert2(w->j_ac_vlc[mode]);
+    av_assert2(j_ac_vlc[mode]);
 }
 
 static inline int x8_get_orient_vlc(IntraX8Context *w)
-- 
2.39.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] lavu/avassert: include config.h

[Nicolas George]

Fix setting the assert level.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavutil/avassert.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavutil/avassert.h b/libavutil/avassert.h
index 51e462bbae..8f3f72c80c 100644
--- a/libavutil/avassert.h
+++ b/libavutil/avassert.h
@@ -28,6 +28,7 @@
 #define AVUTIL_AVASSERT_H
 
 #include <stdlib.h>
+#include "config.h"
 #include "log.h"
 #include "macros.h"
 
-- 
2.39.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/2] lavu/avassert: include config.h

[Hendrik Leppkes]

On Wed, Apr 26, 2023 at 2:32 PM Nicolas George <george@nsup.org> wrote:
>
> Fix setting the assert level.
>
> Signed-off-by: Nicolas George <george@nsup.org>
> ---
>  libavutil/avassert.h | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/libavutil/avassert.h b/libavutil/avassert.h
> index 51e462bbae..8f3f72c80c 100644
> --- a/libavutil/avassert.h
> +++ b/libavutil/avassert.h
> @@ -28,6 +28,7 @@
>  #define AVUTIL_AVASSERT_H
>
>  #include <stdlib.h>
> +#include "config.h"
>  #include "log.h"
>  #include "macros.h"
>

This is an installed header, it cannot depend on config.h

- Hendrik
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/2] lavu/avassert: include config.h

[Nicolas George]

[-- Attachment #1.1.1: Type: text/plain, Size: 306 bytes --]

Hendrik Leppkes (12023-04-26):
> This is an installed header, it cannot depend on config.h

Thanks for spotting it, that was counter-intuitive since config.h is
almost indispensable to its workings.

Updated version attached, similar to what exists in common.h.

Regards,

-- 
  Nicolas George

[-- Attachment #1.1.2: 0001-lavu-avassert-include-config.h.patch --]
[-- Type: text/x-diff, Size: 699 bytes --]

From e1a5ac8ba11d9321e3d0f8bebded805c779a17c1 Mon Sep 17 00:00:00 2001
From: Nicolas George <george@nsup.org>
Date: Wed, 26 Apr 2023 14:29:29 +0200
Subject: [PATCH] lavu/avassert: include config.h

Fix setting the assert level.

Signed-off-by: Nicolas George <george@nsup.org>
---
 libavutil/avassert.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavutil/avassert.h b/libavutil/avassert.h
index 51e462bbae..1895fb7551 100644
--- a/libavutil/avassert.h
+++ b/libavutil/avassert.h
@@ -28,6 +28,9 @@
 #define AVUTIL_AVASSERT_H
 
 #include <stdlib.h>
+#ifdef HAVE_AV_CONFIG_H
+#   include "config.h"
+#endif
 #include "log.h"
 #include "macros.h"
 
-- 
2.39.2


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 2/2] lavu/avassert: include config.h

[Nicolas George]

Nicolas George (12023-04-26):
> Updated version attached, similar to what exists in common.h.

Pushed.

Regards,

-- 
  Nicolas George
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".