[FFmpeg-cvslog] Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'
Michael Niedermayer
git at videolan.org
Sat Mar 21 13:58:04 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 21 13:44:38 2015 +0100| [6abd1e901c065280d50adbbf95eb54773870328c] | committer: Michael Niedermayer
Merge commit '7d8154edd594981e7891d57de91f2260f8a62939'
* commit '7d8154edd594981e7891d57de91f2260f8a62939':
h264: move intra4x4_pred_mode[_cache] into the per-slice context
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6abd1e901c065280d50adbbf95eb54773870328c
---
More information about the ffmpeg-cvslog
mailing list