diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 20:08:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-15 20:08:21 +0100 |
| commit | 8242946af20fbd41142f5bd112f2d278bd69d314 (patch) | |
| tree | 6fef2bffe09ce5b4c107f8fae1194b78cb3ab628 /presets/libvpx-360p.ffpreset | |
| parent | 543e329a26701bdf6520914da633898858ed6114 (diff) | |
| parent | d3449ac938333d59955360b6cb8e7bc24a9b792e (diff) | |
| download | ffmpeg-8242946af20fbd41142f5bd112f2d278bd69d314.tar.gz | |
Merge commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e'
* commit 'd3449ac938333d59955360b6cb8e7bc24a9b792e':
changelog: mention DXVA/HEVC and AAC ELD480
Conflicts:
Changelog
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'presets/libvpx-360p.ffpreset')
0 files changed, 0 insertions, 0 deletions