virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-19 19:03:00 +02:00
Code Issues Releases Activity

avcodec/liboapvenc: fix compilation

Browse Source 
Rebase conflict gone wrong.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2026-06-18 11:00:40 -03:00
parent 5942e4e900
commit 364d309af8
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavcodec/liboapvenc.c
+8 -6
View File
@@ -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;
}