diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:46:20 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:46:38 +0200 |
commit | 5b393766ba9d7c98e14c50975d50aca06d093604 (patch) | |
tree | 30756f5cfb9784cfa210d2d7d33cf27ad18dbb2c /libavfilter/af_channelmap.c | |
parent | 37ce3188decae50a14c1d430c49ecc369d5876a6 (diff) | |
parent | a7c5fddac8137654cb503295c4dfb6492df43643 (diff) | |
download | ffmpeg-5b393766ba9d7c98e14c50975d50aca06d093604.tar.gz |
Merge commit 'a7c5fddac8137654cb503295c4dfb6492df43643'
* commit 'a7c5fddac8137654cb503295c4dfb6492df43643':
avconv_dxva2: define all used GUIDs directly instead of relying on the dxva2api.h header
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_channelmap.c')
0 files changed, 0 insertions, 0 deletions