diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-04-15 13:27:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-16 03:41:41 +0200 |
| commit | 7498f2221ef21335db296e091467418363d1e88f (patch) | |
| tree | 8e36de444b842c82c6815969bc7a9b09d7ebc708 /libavcodec/h264_ps.c | |
| parent | c5d4f87e81111427c0952278ec247fa8ab1e6e52 (diff) | |
| download | ffmpeg-7498f2221ef21335db296e091467418363d1e88f.tar.gz | |
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>
Diffstat (limited to 'libavcodec/h264_ps.c')
| -rw-r--r-- | libavcodec/h264_ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 490cd20419..3c8918115a 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -197,7 +197,7 @@ static inline int decode_vui_parameters(H264Context *h, SPS *sps) 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); - return AVERROR_INVALIDDATA; + sps->timing_info_present_flag = 0; } sps->fixed_frame_rate_flag = get_bits1(&h->gb); } |