[FFmpeg-cvslog] Merge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'
Michael Niedermayer
git at videolan.org
Mon May 19 15:09:58 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 19 15:03:42 2014 +0200| [3791741cf97f6803f7ec1beb8da025f1f779e845] | committer: Michael Niedermayer
Merge commit 'c9f8809ee4c576d5833865039bc1c85754448f67'
* commit 'c9f8809ee4c576d5833865039bc1c85754448f67':
hevc/intra_pred: simplify neighboring sample derivation
Conflicts:
libavcodec/hevcpred_template.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3791741cf97f6803f7ec1beb8da025f1f779e845
---
More information about the ffmpeg-cvslog
mailing list