Merge commit '13ca5d34ba5c473211daaae0a101123bcaada3e6'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:05:15 +0000 (22:05 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 22:05:15 +0000 (22:05 +0000)
* commit '13ca5d34ba5c473211daaae0a101123bcaada3e6':
  cbs_h264: Add hack for pic_timing with no active SPS

Partially fixes #6896 - the sample stream from that ticket now works, but
more obscure cases can still fail.

Merged-by: Mark Thompson <sw@jkqxz.net>
1  2 
libavcodec/cbs_h264_syntax_template.c

Simple merge