diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-17 20:03:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-17 20:03:16 +0200 |
| commit | 67ac31d1bec2c670bf13a12e04b201a2909a6a1a (patch) | |
| tree | 2cb45c184e9c2b593afef987dfb182eb04440102 /presets/libvpx-1080p.ffpreset | |
| parent | 12da8bc38dca53119d44cbbefad0a2b24dc551f5 (diff) | |
| parent | 247aa7af7d8197247c181e3fbfe8d93d75e41b29 (diff) | |
| download | ffmpeg-67ac31d1bec2c670bf13a12e04b201a2909a6a1a.tar.gz | |
Merge commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29'
* commit '247aa7af7d8197247c181e3fbfe8d93d75e41b29':
avisynth: Simplify shared library name construction
Conflicts:
libavformat/avisynth.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-1080p.ffpreset')
0 files changed, 0 insertions, 0 deletions