diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-11-19 19:50:49 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-12-01 11:00:41 +0100 |
| commit | 881e8bcc515ada587b18216da18a402ed88e6f63 (patch) | |
| tree | 031ecc3460dfb9d6a67d051f09aef2d300da5c81 /libavcodec/h264_ps.c | |
| parent | 8d481b0234df19851270f4f6fb78b54bac47d4a3 (diff) | |
avcodec/h264data: Deduplicate H.26[45] aspect ratio table
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 55ef5ce0d3..1fd7375a13 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -31,6 +31,7 @@ #include "mathops.h" #include "avcodec.h" #include "h264data.h" +#include "h2645data.h" #include "h264_ps.h" #include "golomb.h" @@ -142,8 +143,8 @@ static inline int decode_vui_parameters(GetBitContext *gb, void *logctx, if (aspect_ratio_idc == EXTENDED_SAR) { sps->sar.num = get_bits(gb, 16); sps->sar.den = get_bits(gb, 16); - } else if (aspect_ratio_idc < FF_ARRAY_ELEMS(ff_h264_pixel_aspect)) { - sps->sar = ff_h264_pixel_aspect[aspect_ratio_idc]; + } else if (aspect_ratio_idc < FF_ARRAY_ELEMS(ff_h2645_pixel_aspect)) { + sps->sar = ff_h2645_pixel_aspect[aspect_ratio_idc]; } else { av_log(logctx, AV_LOG_WARNING, "Unknown SAR index: %u.\n", aspect_ratio_idc); |