virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: Remove dead code at compile time

Browse Source 
There are no encoders for interlaced dct that support 4:4:4.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2021-12-24 03:00:29 +01:00
parent bf2c34a01a
commit 58f6d1e758
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpegvideo_enc.c
View File

@@ -2035,6 +2035,10 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s,
int chroma_y_shift, int chroma_y_shift,
int chroma_format) int chroma_format)
{ {
/* Interlaced DCT is only possible with MPEG-2 and MPEG-4
* and neither of these encoders currently supports 444. */
#define INTERLACED_DCT(s) ((chroma_format == CHROMA_420 || chroma_format == CHROMA_422) && \
(s)->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT)
int16_t weight[12][64]; int16_t weight[12][64];
int16_t orig[12][64]; int16_t orig[12][64];
const int mb_x = s->mb_x; const int mb_x = s->mb_x;
@@ -2112,7 +2116,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s,
} }
if (s->mb_intra) { if (s->mb_intra) {
if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { if (INTERLACED_DCT(s)) {
int progressive_score, interlaced_score; int progressive_score, interlaced_score;
s->interlaced_dct = 0; s->interlaced_dct = 0;
@@ -2191,7 +2195,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s,
op_pix, op_qpix); op_pix, op_qpix);
} }
if (s->avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { if (INTERLACED_DCT(s)) {
int progressive_score, interlaced_score; int progressive_score, interlaced_score;
s->interlaced_dct = 0; s->interlaced_dct = 0;