ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Apr 20 11:13:03 2015 +0200| [127f7aa401c90f755963ddd3efa425998b025946] | committer: Michael Niedermayer
Merge commit '4d593896aaa81356def8993e8c52294bd8bb2797' * commit '4d593896aaa81356def8993e8c52294bd8bb2797': vc1_pred: Always initialize px and py in ff_vc1_pred_mv_intfr() Conflicts: libavcodec/vc1_pred.c See: 6c5bd7d785ffb796b8cfbae677ab54755b26a22b Merged-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=127f7aa401c90f755963ddd3efa425998b025946 --- _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog