Merge commit '0daa2554636ba1d31f3162ffb86991e84eb938a8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 11:09:00 +0000 (13:09 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 11:09:28 +0000 (13:09 +0200)
commit0a1ffc57882c467b6573b23f1d206aa87caf0025
tree9be8c65fbfad9f722294d77fe6f4ad34bdd19081
parent2fb8aa9b10fcb5f342398a9dcea69fe8ed33db39
parent0daa2554636ba1d31f3162ffb86991e84eb938a8
Merge commit '0daa2554636ba1d31f3162ffb86991e84eb938a8'

* commit '0daa2554636ba1d31f3162ffb86991e84eb938a8':
  hevc: do not store the transform inter_split flag in the context

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