[FFmpeg-cvslog] Merge commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Dec 17 13:00:37 2015 +0100| [10e55bd658b06034d700553190b419b1af92b7cb] | committer: Hendrik Leppkes

Merge commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48'

* commit 'b09ad37c83841c399abb7f2503a2ab214d0c2d48':
  h264: derive the delay from the level when it's not present

Merged without changing the strict_std_compliance check, as it breaks FATE
and changes decoding behavior.

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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