[FFmpeg-cvslog] Merge commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434'

Michael Niedermayer git at videolan.org
Tue Jan 21 15:18:47 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan 21 15:12:53 2014 +0100| [7c4b96f55eb60789031bbade74dc2a0f65f616f4] | committer: Michael Niedermayer

Merge commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434'

* commit 'd5c15ebeaf1914ea5e3e0599d4316d7c4cf74434':
  hevc: Fix modulo operations

Conflicts:
	libavcodec/hevc.c
	libavcodec/hevc_filter.c

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

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





More information about the ffmpeg-cvslog mailing list