[FFmpeg-cvslog] Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'
Michael Niedermayer
git at videolan.org
Sat Dec 21 00:31:31 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 21 00:22:14 2013 +0100| [d6b7ea06f19492c0e51a0ba884e048a1b5aaaa86] | committer: Michael Niedermayer
Merge commit '2a41826bea3833895dc06939831b7f35ca1f597e'
* commit '2a41826bea3833895dc06939831b7f35ca1f597e':
lavc: add HEVC profiles names
Conflicts:
libavcodec/hevc.c
libavcodec/version.h
See: fb7d70c1cd95529cbbbeeab5e9fa3b200ef2545c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d6b7ea06f19492c0e51a0ba884e048a1b5aaaa86
---
More information about the ffmpeg-cvslog
mailing list