Merge commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:52:10 +0000 (15:52 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 13:52:10 +0000 (15:52 +0200)
commit0a946599f881b5129c4af2f4678dca40b6668cc0
tree6ec77ab443ef7ce9ac0610bf83c95d2376ea2452
parent251f283b9d1bbec2fa5031c733d95d319283d6c5
parentecff5acb5a738fcb4f9e206a12070dac4bf259b3
Merge commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3'

* commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3':
  svq1dec: clip motion vectors to the frame size.

Conflicts:
libavcodec/svq1dec.c

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