[FFmpeg-devel] [PATCH] avcodec/libx265: fix else clause when zeroing reordered_opaque

[FFmpeg-devel] [PATCH] avcodec/libx265: fix else clause when zeroing reordered_opaque

[Marton Balint]

CC	libavcodec/libx265.o
libavcodec/libx265.c: In function ‘libx265_encode_frame’:
libavcodec/libx265.c:781:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation]
     else
     ^~~~
libavcodec/libx265.c:782:1: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’
 FF_DISABLE_DEPRECATION_WARNINGS
 ^~~

Signed-off-by: Marton Balint <cus@passwd.hu>
---
 libavcodec/libx265.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 6a2600c5e7..420d0953af 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -778,10 +778,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
         rd_release(ctx, idx);
     }
 #if FF_API_REORDERED_OPAQUE
-    else
+    else {
 FF_DISABLE_DEPRECATION_WARNINGS
         avctx->reordered_opaque = 0;
 FF_ENABLE_DEPRECATION_WARNINGS
+    }
 #endif
 
     *got_packet = 1;
-- 
2.35.3

_______________________________________________
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] avcodec/libx265: fix else clause when zeroing reordered_opaque

[Marton Balint]

On Mon, 13 Feb 2023, Marton Balint wrote:

> CC	libavcodec/libx265.o
> libavcodec/libx265.c: In function ‘libx265_encode_frame’:
> libavcodec/libx265.c:781:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation]
>     else
>     ^~~~
> libavcodec/libx265.c:782:1: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’
> FF_DISABLE_DEPRECATION_WARNINGS
> ^~~

Applied.

Regards,
Marton

>
> Signed-off-by: Marton Balint <cus@passwd.hu>
> ---
> libavcodec/libx265.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
> index 6a2600c5e7..420d0953af 100644
> --- a/libavcodec/libx265.c
> +++ b/libavcodec/libx265.c
> @@ -778,10 +778,11 @@ FF_ENABLE_DEPRECATION_WARNINGS
>         rd_release(ctx, idx);
>     }
> #if FF_API_REORDERED_OPAQUE
> -    else
> +    else {
> FF_DISABLE_DEPRECATION_WARNINGS
>         avctx->reordered_opaque = 0;
> FF_ENABLE_DEPRECATION_WARNINGS
> +    }
> #endif
>
>     *got_packet = 1;
> -- 
> 2.35.3
>
> _______________________________________________
> 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 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".