[FFmpeg-cvslog] Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'
Michael Niedermayer
git at videolan.org
Thu May 16 09:15:51 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 09:11:04 2013 +0200| [4390fa6273e603f17a2c7244a5de0d8e36397f59] | committer: Michael Niedermayer
Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'
* commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d':
Remove commented-out #includes
h263dec: Remove broken and disabled debug cruft
vc1: Reindent INIT_LUT(), align backslashes
Conflicts:
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4390fa6273e603f17a2c7244a5de0d8e36397f59
---
More information about the ffmpeg-cvslog
mailing list