diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:42:26 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 23:42:54 +0100 |
commit | 97bd0e2a93f1a36b377ebb181ba0fe56e93e6c03 (patch) | |
tree | ce6a380a5d7a037b11bba77e32d0f37e50d38683 /libavutil/twofish.c | |
parent | d06dce21a454f541acec329aa5299e67cd9d0994 (diff) | |
parent | c78dc12118cb5b2a69a17f38c69f77a42e89a9c4 (diff) | |
download | ffmpeg-97bd0e2a93f1a36b377ebb181ba0fe56e93e6c03.tar.gz |
Merge commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4'
* commit 'c78dc12118cb5b2a69a17f38c69f77a42e89a9c4':
riff: Support ProRes in avi (APCH fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/twofish.c')
0 files changed, 0 insertions, 0 deletions