ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Tue Nov 25
11:33:51 2014 +0100| [ed25ca16617121b382a961980707844fafcf82f8] | committer:
Michael Niedermayer
Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'
* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb':
vc1: Simplify a little setting the intra variables
Conflicts:
libavcodec/vc1_block.c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed25ca16617121b382a961980707844fafcf82f8
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
