[FFmpeg-devel] [PATCH] avcodec/libaomenc: Fix compilation

[FFmpeg-devel] [PATCH] avcodec/libaomenc: Fix compilation

[Andreas Rheinhardt]

The struct aom_codec_ctx for the encoder is part of the
AOMEncoderContext, it is not separately allocated.
Therefore 5bab794e4aaed55d3146723974ffb5ad792617ab broke compilation.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/libaomenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index a82b933c18..1e89b7e3a8 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -400,7 +400,7 @@ static av_cold int aom_free(AVCodecContext *avctx)
 #if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \
     defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \
     defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX)
-    if (ctx->encoder->iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) {
+    if (ctx->encoder.iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) {
         int num_operating_points;
         int levels[32];
         int target_levels[32];
-- 
2.34.1

_______________________________________________
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/libaomenc: Fix compilation

[Andreas Rheinhardt]

Andreas Rheinhardt:
> The struct aom_codec_ctx for the encoder is part of the
> AOMEncoderContext, it is not separately allocated.
> Therefore 5bab794e4aaed55d3146723974ffb5ad792617ab broke compilation.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
>  libavcodec/libaomenc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
> index a82b933c18..1e89b7e3a8 100644
> --- a/libavcodec/libaomenc.c
> +++ b/libavcodec/libaomenc.c
> @@ -400,7 +400,7 @@ static av_cold int aom_free(AVCodecContext *avctx)
>  #if defined(AOM_CTRL_AV1E_GET_NUM_OPERATING_POINTS) && \
>      defined(AOM_CTRL_AV1E_GET_SEQ_LEVEL_IDX) && \
>      defined(AOM_CTRL_AV1E_GET_TARGET_SEQ_LEVEL_IDX)
> -    if (ctx->encoder->iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) {
> +    if (ctx->encoder.iface && !(avctx->flags & AV_CODEC_FLAG_PASS1)) {
>          int num_operating_points;
>          int levels[32];
>          int target_levels[32];

Seems like I am too late to the party and this has already been fixed.
(I got a new version of libaom because I presumed that
5bab794e4aaed55d3146723974ffb5ad792617ab would cause a crash in case
init fails before ctx->encoder can be set, but before I could test this
it turned out that it doesn't even compile.)

- Andreas
_______________________________________________
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".