diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 19:39:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-09 19:43:18 +0100 |
| commit | ffe987b96dd4e8d39be094142c859664106b6b45 (patch) | |
| tree | caa9b73c2721e7250547423039b7ab9ca250b3ab /libavformat | |
| parent | c333987876ba0d792ff2ca21348e5df284089d51 (diff) | |
| parent | 722554788b77c13748e83458f626a9ac38b70072 (diff) | |
| download | ffmpeg-ffe987b96dd4e8d39be094142c859664106b6b45.tar.gz | |
Merge commit '722554788b77c13748e83458f626a9ac38b70072'
* commit '722554788b77c13748e83458f626a9ac38b70072':
Add raw HEVC muxer
Conflicts:
libavformat/version.h
See: ef5d32b9c5313a1e4491d7f647deae5cb76ca4b0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions