ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Nov 17
11:41:35 2014 +0100| [30156eab6d816878bb404fb1565d026aad0d2d9e] | committer:
Michael Niedermayer
Merge commit 'de1f8ead8993512925a3ee6c7491473414419e55'
* commit 'de1f8ead8993512925a3ee6c7491473414419e55':
hevcdsp_template: templatize transquant_bypass
Conflicts:
libavcodec/hevcdsp_template.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30156eab6d816878bb404fb1565d026aad0d2d9e
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
