diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:47:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:47:51 +0100 |
commit | 3aee1fa5b65086da4bb151f3cdfd89389d8b0ff9 (patch) | |
tree | 706cde736c279d270829a55b4dd5094ffcecf553 /version.sh | |
parent | 89a9c84ebb1292a631b0895b80cddb9d0ba8ad0f (diff) | |
parent | ea3309eba715e83027e8ece4a226e39a4bf2a6ce (diff) | |
download | ffmpeg-3aee1fa5b65086da4bb151f3cdfd89389d8b0ff9.tar.gz |
Merge commit 'ea3309eba715e83027e8ece4a226e39a4bf2a6ce' into release/2.2
* commit 'ea3309eba715e83027e8ece4a226e39a4bf2a6ce':
movenc: use 'hev1' tag for HEVC in MODE_MOV.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'version.sh')
0 files changed, 0 insertions, 0 deletions