Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 13:40:26 +0000 (14:40 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 6 Jan 2014 13:43:04 +0000 (14:43 +0100)
commite86cd37a7026d277e81413cbdde06556742791bb
tree46947604056a3e93030aea1aaa2c64ee7259a31a
parent80d44190c4d909e9685d04bcde693da3e2441dfd
parentf4a8a0080537484154bb74e08ec76cbcbd25484b
Merge commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b'

* commit 'f4a8a0080537484154bb74e08ec76cbcbd25484b':
  sgidec: fix buffer size check in expand_rle_row()

Conflicts:
libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sgidec.c