[FFmpeg-cvslog] Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'

Michael Niedermayer git at videolan.org
Sat Aug 9 21:31:43 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Aug  9 21:17:14 2014 +0200| [8d7c4cc08238d06eb921bb0c6134a4475b0c689e] | committer: Michael Niedermayer

Merge commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4'

* commit 'a7a17e3f1915ce69b787dc58c5d8dba0910fc0a4':
  hevc_filter: move some conditions out of loops

Conflicts:
	libavcodec/hevc_filter.c

This is possibly less readable than the variant used before.
Thus please take a look and if people agree its worse, dont
hesitate to revert.

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

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





More information about the ffmpeg-cvslog mailing list