virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: Move H.261 size check to h261enc.c

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-10-02 21:49:53 +02:00
parent 759d216c47
commit d74ca6fdb4
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h261enc.c
View File

@ -382,11 +382,18 @@ static av_cold void h261_encode_init_static(void)
init_uni_h261_rl_tab(&ff_h261_rl_tcoeff, uni_h261_rl_len);
}
av_cold void ff_h261_encode_init(MpegEncContext *s)
av_cold int ff_h261_encode_init(MpegEncContext *s)
{
H261EncContext *const h = (H261EncContext*)s;
static AVOnce init_static_once = AV_ONCE_INIT;
if (ff_h261_get_picture_format(s->width, s->height) < 0) {
av_log(s->avctx, AV_LOG_ERROR,
"The specified picture size of %dx%d is not valid for the "
"H.261 codec.\nValid sizes are 176x144, 352x288\n",
s->width, s->height);
return AVERROR(EINVAL);
}
s->private_ctx = &h->common;
s->min_qcoeff = -127;
@ -398,6 +405,8 @@ av_cold void ff_h261_encode_init(MpegEncContext *s)
s->intra_ac_vlc_length = s->inter_ac_vlc_length = uni_h261_rl_len;
s->intra_ac_vlc_last_length = s->inter_ac_vlc_last_length = uni_h261_rl_len + 128*64;
ff_thread_once(&init_static_once, h261_encode_init_static);
return 0;
}
const FFCodec ff_h261_encoder = {

2
libavcodec/h261enc.h
View File

@ -35,6 +35,6 @@ void ff_h261_reorder_mb_index(MpegEncContext *s);
void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64],
int motion_x, int motion_y);
void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number);
void ff_h261_encode_init(MpegEncContext *s);
int ff_h261_encode_init(MpegEncContext *s);
#endif

11
libavcodec/mpegvideo_enc.c
View File

@ -682,14 +682,9 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
case AV_CODEC_ID_H261:
if (!CONFIG_H261_ENCODER)
return AVERROR_ENCODER_NOT_FOUND;
if (ff_h261_get_picture_format(s->width, s->height) < 0) {
av_log(avctx, AV_LOG_ERROR,
"The specified picture size of %dx%d is not valid for the "
"H.261 codec.\nValid sizes are 176x144, 352x288\n",
s->width, s->height);
return AVERROR(EINVAL);
}
ff_h261_encode_init(s);
ret = ff_h261_encode_init(s);
if (ret < 0)
return ret;
s->out_format = FMT_H261;
avctx->delay = 0;
s->low_delay = 1;