Michael Niedermayer 4390fa6273 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@gmx.at>

2013-05-16 09:11:04 +02:00

4.4 KiB

Raw Blame History

View Raw