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/mpeg12dec: Remove redundant save_width/height

Browse Source 
These have been added in 29644cb504
in 2007 at a time when the MPEG-1/2 parser just set
the AVCodecContext's dimensions when encountering a sequence header,
so that the checks for the coded dimensions didn't trigger.
Yet this is no more and so we can simply remove these redundant checks.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-05-17 00:56:02 +02:00
parent 56497671dd
commit 562192e283
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mpeg12dec.c
View File

@ -80,7 +80,7 @@ typedef struct Mpeg1Context {
int has_afd; int has_afd;
int slice_count; int slice_count;
unsigned aspect_ratio_info; unsigned aspect_ratio_info;
int save_width, save_height, save_progressive_seq, save_chroma_format; int save_progressive_seq, save_chroma_format;
AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */
unsigned frame_rate_index; unsigned frame_rate_index;
int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */
@ -915,8 +915,6 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
if (!s->context_initialized || if (!s->context_initialized ||
avctx->coded_width != s->width || avctx->coded_width != s->width ||
avctx->coded_height != s->height || avctx->coded_height != s->height ||
s1->save_width != s->width ||
s1->save_height != s->height ||
s1->save_chroma_format != s->chroma_format || s1->save_chroma_format != s->chroma_format ||
(s1->save_progressive_seq != s->progressive_sequence && FFALIGN(s->height, 16) != FFALIGN(s->height, 32)) || (s1->save_progressive_seq != s->progressive_sequence && FFALIGN(s->height, 16) != FFALIGN(s->height, 32)) ||
0) { 0) {
@ -934,8 +932,6 @@ static int mpeg_decode_postinit(AVCodecContext *avctx)
(s1->bit_rate != 0x3FFFF*400 || s1->vbv_delay != 0xFFFF)) { (s1->bit_rate != 0x3FFFF*400 || s1->vbv_delay != 0xFFFF)) {
avctx->bit_rate = s1->bit_rate; avctx->bit_rate = s1->bit_rate;
} }
s1->save_width = s->width;
s1->save_height = s->height;
s1->save_progressive_seq = s->progressive_sequence; s1->save_progressive_seq = s->progressive_sequence;
s1->save_chroma_format = s->chroma_format; s1->save_chroma_format = s->chroma_format;
@ -1863,8 +1859,6 @@ static int vcr2_init_sequence(AVCodecContext *avctx)
} else { } else {
s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO;
} }
s1->save_width = s->width;
s1->save_height = s->height;
s1->save_progressive_seq = s->progressive_sequence; s1->save_progressive_seq = s->progressive_sequence;
s1->save_chroma_format = s->chroma_format; s1->save_chroma_format = s->chroma_format;
return 0; return 0;