Merge commit 'e76f2d11970484266e67a12961f2339a5c2fccf9'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 12:02:03 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 12:02:03 +0000 (14:02 +0200)
commite0492311c8541da55a4b08641364ce8e1a169740
tree2842224326b912fe570668965fb4d9773d021570
parent4a73fa19ca7ac74f16422eabf731b86796b7d588
parente76f2d11970484266e67a12961f2339a5c2fccf9
Merge commit 'e76f2d11970484266e67a12961f2339a5c2fccf9'

* commit 'e76f2d11970484266e67a12961f2339a5c2fccf9':
  hevc: eliminate the last element from TransformTree

Conflicts:
libavcodec/hevc.c

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