ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sat Mar 21
14:03:14 2015 +0100| [f1436a7f961519f2f149c5eda72af988004f4483] | committer:
Michael Niedermayer
Merge commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b'
* commit 'e6287f077c3e8e4aca11e61dd4bade1351439e6b':
h264: move {mv,ref}_cache into the per-slice context
Conflicts:
libavcodec/h264_cabac.c
libavcodec/h264_mb.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f1436a7f961519f2f149c5eda72af988004f4483
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
