Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:35:41 +0000 (15:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:40:47 +0000 (15:40 +0200)
commit251f283b9d1bbec2fa5031c733d95d319283d6c5
tree827c75557e11a07cd06e10da21a9281fd7b7f990
parentf60ba6c52418a42c5a59a6b9d1e8c13b41c961e3
parentb1bb8fb860b47e90dd67f0c5740698128fc82dcc
Merge commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc'

* commit 'b1bb8fb860b47e90dd67f0c5740698128fc82dcc':
  svq1dec: check that the reference frame has the same dimensions as the current one

Conflicts:
libavcodec/svq1dec.c

See: 3b57bb478ff4455773378355e285877d757e151e

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