Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 16:26:37 +0000 (17:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 28 Feb 2014 16:26:37 +0000 (17:26 +0100)
commit18d870da83b172c89495b6543001b2ecdf4ae1e2
tree4728252b4549ba0ebb0b7ce03a6d04d29c7d4a41
parent5ba1648318161b394499a04e8fc7385ee2fbf375
parentd6acefe05862af244fd5a30ae946ed507c063994
Merge commit 'd6acefe05862af244fd5a30ae946ed507c063994'

* commit 'd6acefe05862af244fd5a30ae946ed507c063994':
  proresenc: Drop unnecessary DCT permutation bits

Conflicts:
libavcodec/proresenc_kostya.c

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