Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:07:11 +0000 (12:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 10:09:38 +0000 (12:09 +0200)
commit6561aae8a955b9237034a004fc92d7fbb3541491
tree74d25600e38874365ee9909a5c20d6ad0b57f3bf
parent39a69d9dfbc7d527018546d7a1a1be99d82dceeb
parent3ca1dd2502a860989ee5289316af6b9816cee78f
Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'

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

Conflicts:
libavcodec/xl.c

See: 94b42da6963a88c9518039e0b8ca42b6aab8bfb3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/xl.c