Merge commit '32c8d89c036b0e75ece74aea638df587099def0b'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 23:33:58 +0000 (01:33 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 23:33:58 +0000 (01:33 +0200)
commit3edc6d1cd9ef23e809a8d814dbfb589e7e1f57fe
tree8ae6d7a413a3702a4c3953e2e7cec25c81c61def
parente17a459af06e222a04b98d1ef59b12e408f061e5
parent32c8d89c036b0e75ece74aea638df587099def0b
Merge commit '32c8d89c036b0e75ece74aea638df587099def0b'

* commit '32c8d89c036b0e75ece74aea638df587099def0b':
  hevc: Print the non-supported chroma_format_idc

Conflicts:
libavcodec/hevc_ps.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/hevc_ps.c