This is an automated email from the git hooks/post-receive script.
Git pushed a commit to branch master
in repository ffmpeg.
The following commit(s) were added to refs/heads/master by this push:
new 364d309af8 avcodec/liboapvenc: fix compilation
364d309af8 is described below
commit 364d309af81d861fa294ddb80b37369af4d980a3
Author: James Almer <[email protected]>
AuthorDate: Thu Jun 18 11:00:40 2026 -0300
Commit: James Almer <[email protected]>
CommitDate: Thu Jun 18 11:00:40 2026 -0300
avcodec/liboapvenc: fix compilation
Rebase conflict gone wrong.
Signed-off-by: James Almer <[email protected]>
---
libavcodec/liboapvenc.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/libavcodec/liboapvenc.c b/libavcodec/liboapvenc.c
index 727e1bf84c..51b4343c05 100644
--- a/libavcodec/liboapvenc.c
+++ b/libavcodec/liboapvenc.c
@@ -29,6 +29,7 @@
#include "libavutil/avassert.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/imgutils.h"
+#include "libavutil/internal.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "libavutil/pixdesc.h"
@@ -398,6 +399,13 @@ static int get_conf(AVCodecContext *avctx, oapve_cdesc_t
*cdsc)
}
}
+ ret = validate_profile(avctx, cdsc->param[FRM_IDX].profile_idc);
+ if (ret < 0)
+ return ret;
+
+ avctx->profile = cdsc->param[FRM_IDX].profile_idc;
+
+
return 0;
}
@@ -455,12 +463,6 @@ static int handle_side_data(AVCodecContext *avctx,
ApvEncContext *apv)
}
}
- ret = validate_profile(avctx, cdsc->param[FRM_IDX].profile_idc);
- if (ret < 0)
- return ret;
-
- avctx->profile = cdsc->param[FRM_IDX].profile_idc;
-
return 0;
}
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
