virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: Remove some impossible branches

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-12-13 14:43:58 +01:00
parent 9f906f3114
commit a595717d21
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/mpegvideo_enc.c
View File

@@ -885,15 +885,16 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx)
ff_set_cmp(&s->mecc, s->mecc.ildct_cmp, avctx->ildct_cmp); ff_set_cmp(&s->mecc, s->mecc.ildct_cmp, avctx->ildct_cmp);
ff_set_cmp(&s->mecc, s->mecc.frame_skip_cmp, s->frame_skip_cmp); ff_set_cmp(&s->mecc, s->mecc.frame_skip_cmp, s->frame_skip_cmp);
if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) if (CONFIG_H261_ENCODER && s->out_format == FMT_H261) {
ff_h261_encode_init(s); ff_h261_encode_init(s);
if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) } else if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
ff_h263_encode_init(s); && s->out_format == FMT_MPEG1) {
if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version)
ff_msmpeg4_encode_init(s);
if ((CONFIG_MPEG1VIDEO_ENCODER || CONFIG_MPEG2VIDEO_ENCODER)
&& s->out_format == FMT_MPEG1)
ff_mpeg1_encode_init(s); ff_mpeg1_encode_init(s);
} else if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) {
ff_h263_encode_init(s);
if (CONFIG_MSMPEG4_ENCODER && s->msmpeg4_version)
ff_msmpeg4_encode_init(s);
}
/* init q matrix */ /* init q matrix */
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {
@@ -3695,7 +3696,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16, ff_convert_matrix(s, s->q_chroma_intra_matrix, s->q_chroma_intra_matrix16,
s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1);
s->qscale= 8; s->qscale= 8;
}
if(s->codec_id == AV_CODEC_ID_AMV){ if(s->codec_id == AV_CODEC_ID_AMV){
static const uint8_t y[32]={13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13}; static const uint8_t y[32]={13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13};
static const uint8_t c[32]={14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14}; static const uint8_t c[32]={14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14,14};
@@ -3715,8 +3716,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1); s->chroma_intra_matrix, s->intra_quant_bias, 8, 8, 1);
s->qscale= 8; s->qscale= 8;
} }
} else if (s->out_format == FMT_SPEEDHQ) {
if (s->out_format == FMT_SPEEDHQ) {
s->y_dc_scale_table= s->y_dc_scale_table=
s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3]; s->c_dc_scale_table= ff_mpeg2_dc_scale_table[3];
} }