[FFmpeg-cvslog] Merge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2

Michael Niedermayer git at videolan.org
Tue Mar 11 11:57:14 CET 2014


ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 11 11:39:46 2014 +0100| [0adde39e048868e1b3e2f7c94c4d47f45f5438f9] | committer: Michael Niedermayer

Merge commit 'ca2c9d6b9bfadb64e1502594fdf745a391699890' into release/2.2

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

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

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

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





More information about the ffmpeg-cvslog mailing list