Merge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:00:51 +0000 (16:00 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Apr 2014 14:00:51 +0000 (16:00 +0200)
commit8401ed651b2c6b089ebb6d5afbf05e662dfbf87e
tree322928cb3f55ac505845e80fcc15f82be4d37695
parentfcaf78f5f94130471dcbd9fa63e8363ce2fdefe0
parentea1806ce650f0502dd25939c335b9216fa4a955f
Merge commit 'ea1806ce650f0502dd25939c335b9216fa4a955f' into release/1.1

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

Conflicts:
libavcodec/sgidec.c

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