diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 00:06:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-12 00:06:35 +0200 |
| commit | c4fe50b954a0490c54efca19682cfae00eba3145 (patch) | |
| tree | cb22437d8ba280f221417ed8638b5a0b26413b75 /COPYING.GPLv3 | |
| parent | fa0f7c024e90a5337892cbc3b78e936ba5d25cf3 (diff) | |
| parent | ebc29519d1634bfeb386c20a5d8a52837aae2436 (diff) | |
| download | ffmpeg-c4fe50b954a0490c54efca19682cfae00eba3145.tar.gz | |
Merge commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436'
* commit 'ebc29519d1634bfeb386c20a5d8a52837aae2436':
hwaccel: Support specific frame allocators
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions