Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:01:47 +0000 (12:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:01:47 +0000 (12:01 +0100)
commitc23d7de22ec0c14ad35d40c9073451c64a5ce74d
treed4f524dde77617c005fe8b74a60a9a19d9d5e547
parente078549421b2845799abe878fc2a60ec89399fcc
parent84c0ece5fd9569c0f31804f02a199ecd0e7d13d8
Merge commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8'

* commit '84c0ece5fd9569c0f31804f02a199ecd0e7d13d8':
  hevc: further reduce code duplication in hls_prediction_unit()

Conflicts:
libavcodec/hevc.c

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