Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -36,12 +36,10 @@ · 35 unmodified lines | |||
| 36 | 36 | ||
| 37 | void ff_h2645_decode_common_vui_params(GetBitContext *gb, H2645VUI *vui, void *logctx) | 37 | void ff_h2645_decode_common_vui_params(GetBitContext *gb, H2645VUI *vui, void *logctx) |
| 38 | { | 38 | { |
| 39 | int aspect_ratio_info_present_flag; | ||
| 40 | |||
| 41 | av_log(logctx, AV_LOG_DEBUG, "Decoding VUI\n"); | 39 | av_log(logctx, AV_LOG_DEBUG, "Decoding VUI\n"); |
| 42 | 40 | ||
| 43 | aspect_ratio_info_present_flag = get_bits1(gb); | 41 | vui->aspect_ratio_info_present_flag = get_bits1(gb); |
| 44 | if (aspect_ratio_info_present_flag) { | 42 | if (vui->aspect_ratio_info_present_flag) { |
| 45 | vui->aspect_ratio_idc = get_bits(gb, 8); | 43 | vui->aspect_ratio_idc = get_bits(gb, 8); |
| 46 | if (vui->aspect_ratio_idc < FF_ARRAY_ELEMS(ff_h2645_pixel_aspect)) | 44 | if (vui->aspect_ratio_idc < FF_ARRAY_ELEMS(ff_h2645_pixel_aspect)) |
| 47 | vui->sar = ff_h2645_pixel_aspect[vui->aspect_ratio_idc]; | 45 | vui->sar = ff_h2645_pixel_aspect[vui->aspect_ratio_idc]; |
| @@ -27,6 +27,7 @@ · 26 unmodified lines | |||
| 27 | typedef struct H2645VUI { | 27 | typedef struct H2645VUI { |
| 28 | AVRational sar; | 28 | AVRational sar; |
| 29 | int aspect_ratio_idc; | 29 | int aspect_ratio_idc; |
| 30 | int aspect_ratio_info_present_flag; | ||
| 30 | 31 | ||
| 31 | int overscan_info_present_flag; | 32 | int overscan_info_present_flag; |
| 32 | int overscan_appropriate_flag; | 33 | int overscan_appropriate_flag; |