vc1: Reindent INIT_LUT(), align backslashes

Signed-off-by: Martin Storsjö <martin@martin.st>
h263dec: Remove broken and disabled debug cruft
Remove commented-out #includes
mpegvideo: Remove commented-out PARANOID debug cruft
jpegls: cosmetics: Drop some unnecessary parentheses
jpegls: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Remove commented-out debug #define cruft
vf_aspect: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_blackframe: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_boxblur: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_crop: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_crop: cosmetics, break lines
vf_cropdetect: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_delogo: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_drawbox: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_drawtext: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
vf_fade: use the name 's' for the pointer to the private context

This is shorter and consistent across filters.
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>
Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'

* commit '9cacdabd1c8cd257a942d8289349c37d992989b7':
  jpegls: cosmetics: Drop some unnecessary parentheses
  mpegvideo: Remove commented-out PARANOID debug cruft

Conflicts:
	libavcodec/jpegls.c
	libavcodec/mpegvideo.c
	libavcodec/x86/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec'

* commit 'ff4fc5ef12a37716c5c5d8928a2db92428e916ec':
  jpegls: K&R formatting cosmetics

Conflicts:
	libavcodec/jpegls.c
	libavcodec/jpegls.h
	libavcodec/jpeglsdec.c
	libavcodec/jpeglsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>