Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 23:39:11 +0000 (00:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Dec 2013 23:44:44 +0000 (00:44 +0100)
commite00281b6f507ab7dc83a632d9ad9f150a05a10e9
treed1a343141470bb53f878820e0aa44fcb54fc1c3d
parent2fb9e77ac2da4f82145a56b7d01ae4045b5da3eb
parent2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8
Merge commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8'

* commit '2d18aaa14bc2233b0647d2c5abb72e0bc828c2a8':
  hevc: refactor Profile Tier Level
  hevc: don't check for errors in PTL code

Conflicts:
libavcodec/hevc_ps.c

See: 36658c978f5d7df2ce556075946f3a80f7eca753
See: dddc9b7a8ec3a03e48c69991ca7f20f10dd6f022
See: ecb21d24373ccf8f1d090cff48f4e0c384b7f998
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc_ps.c