ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Jan 27
14:12:53 2015 +0100| [4e40e6128769246ee101e1990be42880a07dda18] | committer:
Michael Niedermayer
Merge commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba'
* commit 'e72e8c5a1df61447ac7af750531e96e8b62d02ba':
hevc: add hwaccel hooks
Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c
See: b2e9b0f5d4dca93f54fba85f3345970a636e2b82
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e40e6128769246ee101e1990be42880a07dda18
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
