Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 22:06:35 +0000 (00:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 May 2014 22:06:35 +0000 (00:06 +0200)
commitc4fe50b954a0490c54efca19682cfae00eba3145
treecb22437d8ba280f221417ed8638b5a0b26413b75
parentfa0f7c024e90a5337892cbc3b78e936ba5d25cf3
parentebc29519d1634bfeb386c20a5d8a52837aae2436
Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'

* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436':
  hwaccel: Support specific frame allocators

Conflicts:
libavcodec/utils.c

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