[FFmpeg-cvslog] Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 29 12:07:11 2013 +0200| [6561aae8a955b9237034a004fc92d7fbb3541491] | committer: Michael Niedermayer

Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'

* commit '3ca1dd2502a860989ee5289316af6b9816cee78f':
  xl: Make sure the width is valid

Conflicts:
	libavcodec/xl.c

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

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