RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264: Do not fail on unsupported timing info 

The spec madandate both time_scale and num_units_in_tick greater than 0,
however since they are not essential for decoding, just ignore the whole
block and try to finish parsing the VUI.

Related to Ticket4445.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2015-04-15 13:27:01 +01:00 committed by Michael Niedermayer
parent c5d4f87e81
commit 7498f2221e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_ps.c
View File

@ -197,7 +197,7 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps)
av_log(h->avctx, AV_LOG_ERROR, av_log(h->avctx, AV_LOG_ERROR,
"time_scale/num_units_in_tick invalid or unsupported (%"PRIu32"/%"PRIu32")\n", "time_scale/num_units_in_tick invalid or unsupported (%"PRIu32"/%"PRIu32")\n",
sps->time_scale, sps->num_units_in_tick); sps->time_scale, sps->num_units_in_tick);
return AVERROR_INVALIDDATA; sps->timing_info_present_flag = 0;
} }
sps->fixed_frame_rate_flag = get_bits1(&h->gb); sps->fixed_frame_rate_flag = get_bits1(&h->gb);
} }