ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Aug 12
16:27:17 2014 +0200| [5195512addc1f6bced2e33b8faf77abb5b8703b6] | committer:
Michael Niedermayer
Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'
* commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc':
hevc: derive partial merge list
Conflicts:
libavcodec/hevc_mvs.c
See: 4576eff05d94a5e0b853a7a595d31351cc539e7b
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5195512addc1f6bced2e33b8faf77abb5b8703b6
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
