[FFmpeg-cvslog] h264: Do not fail on unsupported timing info

[Vittorio Giovara]

ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Wed Apr 15 13:27:01 2015 +0100| [7498f2221ef21335db296e091467418363d1e88f] | committer: Michael Niedermayer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7498f2221ef21335db296e091467418363d1e88f
---

 libavcodec/h264_ps.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 490cd20..3c89181 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);
     }