Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:41:35 +0000 (11:41 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 10:41:35 +0000 (11:41 +0100)
commit30156eab6d816878bb404fb1565d026aad0d2d9e
treec8c44afc883f465a80b37020276edb0a95b99c33
parentc192be196839ae28a55b37a01209bc052b8fdbe3
parentde1f8ead8993512925a3ee6c7491473414419e55
Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'

* commit 'de1f8ead8993512925a3ee6c7491473414419e55':
  hevcdsp_template: templatize transquant_bypass

Conflicts:
libavcodec/hevcdsp_template.c

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