Merge commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703'
authorClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:06:11 +0000 (14:06 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:06:11 +0000 (14:06 +0200)
* commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703':
  h264: Fix decoding delay for Intra only streams

Merged-by: Clément Bœsch <u@pkh.me>
1  2 
libavcodec/h264_ps.c

Simple merge