ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sat Mar 21
14:38:59 2015 +0100| [a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3] | committer:
Michael Niedermayer
Merge commit '066aafced4dc6c7c9e7b37082635472249f1e93e'
* commit '066aafced4dc6c7c9e7b37082635472249f1e93e':
h264: move direct_spatial_mv_pred into the per-slice context
Conflicts:
libavcodec/h264_mvpred.h
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a8ac4c9b06b9f3ee73ef377a3e4392957c72c2b3
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
