[FFmpeg-cvslog] Merge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'

Michael Niedermayer git at videolan.org
Mon Jul 28 13:08:43 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 28 13:03:59 2014 +0200| [2fb8aa9b10fcb5f342398a9dcea69fe8ed33db39] | committer: Michael Niedermayer

Merge commit '53a11135f2fb2123408b295f9aaae3d6f861aea5'

* commit '53a11135f2fb2123408b295f9aaae3d6f861aea5':
  hevc: simplify splitting the transform tree blocks

Conflicts:
	libavcodec/hevc.c

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

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





More information about the ffmpeg-cvslog mailing list