Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:20:32 +0000 (11:20 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:20:32 +0000 (11:20 +0100)
commitf1b20930f206349a666ec314d76c3fcb86c6b9a7
treea8a94489ff233ad1b5704eeec083110723761c78
parent7cbe1e044701898aadda9958ddb67f6ea95fc72b
parent2c6a7f9348378f887066fb1669c46b9485e8ef3e
Merge commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e'

* commit '2c6a7f9348378f887066fb1669c46b9485e8ef3e':
  hevc: do not store rqt_root_cbf in the context

Conflicts:
libavcodec/hevc.c

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