[FFmpeg-cvslog] Merge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'

Michael Niedermayer git at videolan.org
Sun Mar 9 22:06:14 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Mar  9 21:44:40 2014 +0100| [eaaa5801efec0888a5ab243e9befd91163b79d06] | committer: Michael Niedermayer

Merge commit '4d33873c2990b8d6096f60fef384f0efc4482b55'

* commit '4d33873c2990b8d6096f60fef384f0efc4482b55':
  hevc: make pps/sps ids unsigned where necessary

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

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

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





More information about the ffmpeg-cvslog mailing list