[FFmpeg-cvslog] Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'
Michael Niedermayer
git at videolan.org
Tue Aug 19 19:11:45 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug 19 18:43:42 2014 +0200| [580e81fca5781291950774b18965cc7322f77cb2] | committer: Michael Niedermayer
Merge commit 'd456baafb68cd80c0f537f1d843076e4dd853558'
* commit 'd456baafb68cd80c0f537f1d843076e4dd853558':
vc1: Add missing parentheses to conditions in vc1_decode_b_mb_intfr()
Conflicts:
libavcodec/vc1dec.c
See: 1e2ab98460761c86268993e7a7ee690876df5efd
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=580e81fca5781291950774b18965cc7322f77cb2
---
More information about the ffmpeg-cvslog
mailing list