[FFmpeg-cvslog] Merge commit '9cacdabd1c8cd257a942d8289349c37d992989b7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 09:19:11 2013 +0200| [0d83b5722e2875cd4a2ac3574af72b5be633c73d] | committer: Michael Niedermayer

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 at gmx.at>

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