Merge commit '9c7321e2b8981ec867294309e9cf3833055df78f' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 23:32:25 +0000 (01:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 19 Jun 2014 23:32:33 +0000 (01:32 +0200)
* commit '9c7321e2b8981ec867294309e9cf3833055df78f':
  sgidec: fix an incorrect backport

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

Simple merge