Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 23:23:39 +0000 (01:23 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 13 Jul 2015 23:23:39 +0000 (01:23 +0200)
commite17a459af06e222a04b98d1ef59b12e408f061e5
treeafc801b39de3147df7e0002d472b167acc36361d
parentdb1ab7e5af6aeafb04db153828a266d1d998a78e
parent8e373fe048812a25b238ea60a7052b8c07639a42
Merge commit '8e373fe048812a25b238ea60a7052b8c07639a42'

* commit '8e373fe048812a25b238ea60a7052b8c07639a42':
  hevc: Factor out the pixel format mapping from the sps parser

Conflicts:
libavcodec/hevc_ps.c

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