Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:48:08 +0000 (22:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Mar 2014 21:48:08 +0000 (22:48 +0100)
commit1b1d77ae9b38fb257e9ae9fb565091c6b7e43181
treeef4875409644c61d98062cfbc10f7029adfe1e9a
parentce1ad8d775ba74f2ab03675043116be3c305fcb1
parent20b40a597cdd4969cf1147d7c7efee2b6232524b
Merge commit '20b40a597cdd4969cf1147d7c7efee2b6232524b'

* commit '20b40a597cdd4969cf1147d7c7efee2b6232524b':
  movenc: write hvcC tag for HEVC.

Conflicts:
libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/Makefile
libavformat/hevc.c
libavformat/hevc.h
libavformat/movenc.c