[FFmpeg-cvslog] Merge commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72'

Michael Niedermayer git at videolan.org
Sat Dec 21 01:20:28 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 21 01:02:14 2013 +0100| [88839718b58c336e4da9cf2511d91c3ebae444b4] | committer: Michael Niedermayer

Merge commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72'

* commit '5c3fa74b94fdedfd63b606f36920d7fbbc069b72':
  hevc: support luma bit depth != chroma bit depth for PCM coding units

Conflicts:
	libavcodec/hevc.c

See: 0afa254d4efd3c06fd0194789aefc193c8506947
See: a7e300649a7a2105a4f7edfaf936f0a9e05a2d43
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list