diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 01:45:32 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-15 01:47:39 +0100 |
commit | 720a8d2b7518fd8bf69a5fe470f35dd0cb0aafb6 (patch) | |
tree | d31ce2ee5db47f40da69f7912d855ccc6ce23cff /libavfilter/vf_zoompan.c | |
parent | e6e6149630464939fb45b526a90a4dcdb4ff1841 (diff) | |
parent | 4b39cc1a093c239412ded522c4a899744e7f2008 (diff) | |
download | ffmpeg-720a8d2b7518fd8bf69a5fe470f35dd0cb0aafb6.tar.gz |
Merge commit '4b39cc1a093c239412ded522c4a899744e7f2008'
* commit '4b39cc1a093c239412ded522c4a899744e7f2008':
riff: support ProRes in avi (APCN fourcc)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_zoompan.c')
0 files changed, 0 insertions, 0 deletions