Merge commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d'

* commit 'f1cb490d6d7391ff7e28cc376908cc98a652228d':
  xl: Fix the buffer size check

Conflicts:
	libavcodec/xl.c

See: 8c59e0c362
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-29 11:20:57 +02:00
commit 03853b1091

Diff Content Not Available