[FFmpeg-cvslog] Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'

Michael Niedermayer git at videolan.org
Thu Jul 10 00:25:26 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul 10 00:15:34 2014 +0200| [efc66d69bfb622e874d883e0b304cf18b12e41bd] | committer: Michael Niedermayer

Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'

* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
  hevc: parse display orientation SEI message

Conflicts:
	libavcodec/hevc.h
	libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efc66d69bfb622e874d883e0b304cf18b12e41bd
---





More information about the ffmpeg-cvslog mailing list