Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:54:41 +0000 (11:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:54:41 +0000 (11:54 +0100)
commite078549421b2845799abe878fc2a60ec89399fcc
tree5a96ccebdc6ce207a18a86dc0ddc0dff6e3394a1
parent30156eab6d816878bb404fb1565d026aad0d2d9e
parenta7b365ae191f45a0d7ed7b34033d5d0cbdd47139
Merge commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139'

* commit 'a7b365ae191f45a0d7ed7b34033d5d0cbdd47139':
  hevc: reduce code duplication in hls_prediction_unit()

Conflicts:
libavcodec/hevc.c

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