diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:48:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 11:48:10 +0100 |
| commit | 3faebed6fa29dc3e5846bbb248a7aaf602e14f6e (patch) | |
| tree | 9c92ba01befb028ba6478db4f3826308cf4961df /library.mak | |
| parent | 3aee1fa5b65086da4bb151f3cdfd89389d8b0ff9 (diff) | |
| parent | c761379825ff0bf9dd191e244c4b2f7697fb2b3c (diff) | |
| download | ffmpeg-3faebed6fa29dc3e5846bbb248a7aaf602e14f6e.tar.gz | |
Merge commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c' into release/2.2
* commit 'c761379825ff0bf9dd191e244c4b2f7697fb2b3c':
movenc: write hvcC tag for HEVC.
Conflicts:
libavformat/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions