virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/wmv2enc: Move wmv2_encode_init() down

Browse Source 
Will avoid forward declarations later.
While just at it, forward ff_mpv_encode_init() errors.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-03-03 19:28:41 +01:00
parent e308292a31
commit b2393a5ab1
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libavcodec/wmv2enc.c
View File

@ -73,27 +73,6 @@ static int encode_ext_header(WMV2EncContext *w)
return 0;
}
static av_cold int wmv2_encode_init(AVCodecContext *avctx)
{
WMV2EncContext *const w = avctx->priv_data;
MpegEncContext *const s = &w->msmpeg4.m.s;
s->private_ctx = &w->common;
if (ff_mpv_encode_init(avctx) < 0)
return -1;
ff_wmv2_common_init(s);
avctx->extradata_size = WMV2_EXTRADATA_SIZE;
avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!avctx->extradata)
return AVERROR(ENOMEM);
encode_ext_header(w);
return 0;
}
int ff_wmv2_encode_picture_header(MpegEncContext *s)
{
WMV2EncContext *const w = (WMV2EncContext *) s;
@ -237,6 +216,29 @@ void ff_wmv2_encode_mb(MpegEncContext *s, int16_t block[6][64],
s->p_tex_bits += get_bits_diff(s);
}
static av_cold int wmv2_encode_init(AVCodecContext *avctx)
{
WMV2EncContext *const w = avctx->priv_data;
MpegEncContext *const s = &w->msmpeg4.m.s;
int ret;
s->private_ctx = &w->common;
ret = ff_mpv_encode_init(avctx);
if (ret < 0)
return ret;
ff_wmv2_common_init(s);
avctx->extradata_size = WMV2_EXTRADATA_SIZE;
avctx->extradata = av_mallocz(avctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE);
if (!avctx->extradata)
return AVERROR(ENOMEM);
encode_ext_header(w);
return 0;
}
const FFCodec ff_wmv2_encoder = {
.p.name = "wmv2",
CODEC_LONG_NAME("Windows Media Video 8"),