Merge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 11:03:59 +0000 (13:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 11:03:59 +0000 (13:03 +0200)
commit2fb8aa9b10fcb5f342398a9dcea69fe8ed33db39
tree3d0f0530f95e64ad0cf4ad06fa363176687714f7
parent453224f10b375c280ab2ef8f6e40213ba5b77d8a
parent53a11135f2fb2123408b295f9aaae3d6f861aea5
Merge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'

* commit '53a11135f2fb2123408b295f9aaae3d6f861aea5':
  hevc: simplify splitting the transform tree blocks

Conflicts:
libavcodec/hevc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hevc.c