Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 09:50:29 +0000 (11:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 May 2013 09:50:37 +0000 (11:50 +0200)
commitb507c00dc03c81002c8f9950cfd73aad9cc88702
tree46a1a0eb14663ea65057766a50913e99cf9b3d14
parenta8ff830b79d05b1c03ae7e2551ff7142e0845cec
parente445647b4fdf481b13b2743b303d84de4f43bedd
Merge commit 'e445647b4fdf481b13b2743b303d84de4f43bedd'

* commit 'e445647b4fdf481b13b2743b303d84de4f43bedd':
  avresample: Add av_cold attributes to init functions missing them

Merged-by: Michael Niedermayer <michaelni@gmx.at>