Commit c658269c authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/h264_ps: Validate num_units_in_tick/time_scale before setting them in the context

This probably makes no big difference but it is more correct
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 7498f222
......@@ -191,13 +191,16 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps)
sps->timing_info_present_flag = get_bits1(&h->gb);
if (sps->timing_info_present_flag) {
sps->num_units_in_tick = get_bits_long(&h->gb, 32);
sps->time_scale = get_bits_long(&h->gb, 32);
if (!sps->num_units_in_tick || !sps->time_scale) {
unsigned num_units_in_tick = get_bits_long(&h->gb, 32);
unsigned time_scale = get_bits_long(&h->gb, 32);
if (!num_units_in_tick || !time_scale) {
av_log(h->avctx, AV_LOG_ERROR,
"time_scale/num_units_in_tick invalid or unsupported (%"PRIu32"/%"PRIu32")\n",
sps->time_scale, sps->num_units_in_tick);
"time_scale/num_units_in_tick invalid or unsupported (%u/%u)\n",
time_scale, num_units_in_tick);
sps->timing_info_present_flag = 0;
} else {
sps->num_units_in_tick = num_units_in_tick;
sps->time_scale = time_scale;
}
sps->fixed_frame_rate_flag = get_bits1(&h->gb);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment