[FFmpeg-cvslog] Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 09:55:22 2013 +0200| [efc08e00cc0b05ea478aef51693199bfb0c3b489] | committer: Michael Niedermayer

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

* commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110':
  vf_aspect: use the name 's' for the pointer to the private context
  Remove commented-out debug #define cruft

Conflicts:
	libavcodec/4xm.c
	libavcodec/dvdsubdec.c
	libavcodec/ituh263dec.c
	libavcodec/mpeg12.c
	libavfilter/avfilter.c
	libavfilter/vf_aspect.c
	libavfilter/vf_fieldorder.c
	libavformat/rtmpproto.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=efc08e00cc0b05ea478aef51693199bfb0c3b489
---