Message ID | AM7PR03MB66604F4EEDB9DE127BE78EB98F909@AM7PR03MB6660.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | 9139dc6140e8fb8d84760f3c567332b41858798d |
Headers | show |
Series | [FFmpeg-devel] avformat/matroskadec: Don't unnecessarily reduce aspect ratio | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
On 11/7/2021 7:42 AM, Andreas Rheinhardt wrote: > Fixes ticket #9497. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > Will apply later tonight unless there are objections. > > libavformat/matroskadec.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c > index b2c4927e43..a4bbbe954e 100644 > --- a/libavformat/matroskadec.c > +++ b/libavformat/matroskadec.c > @@ -2806,7 +2806,7 @@ static int matroska_parse_tracks(AVFormatContext *s) > &st->sample_aspect_ratio.den, > st->codecpar->height * track->video.display_width * display_width_mul, > st->codecpar->width * track->video.display_height * display_height_mul, > - 255); > + INT_MAX); LGTM. > } > if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) > sti->need_parsing = AVSTREAM_PARSE_HEADERS; >
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b2c4927e43..a4bbbe954e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2806,7 +2806,7 @@ static int matroska_parse_tracks(AVFormatContext *s) &st->sample_aspect_ratio.den, st->codecpar->height * track->video.display_width * display_width_mul, st->codecpar->width * track->video.display_height * display_height_mul, - 255); + INT_MAX); } if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) sti->need_parsing = AVSTREAM_PARSE_HEADERS;
Fixes ticket #9497. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- Will apply later tonight unless there are objections. libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)