diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 15:52:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-17 15:52:10 +0200 |
| commit | 0a946599f881b5129c4af2f4678dca40b6668cc0 (patch) | |
| tree | 6ec77ab443ef7ce9ac0610bf83c95d2376ea2452 /libavcodec/j2k.c | |
| parent | 251f283b9d1bbec2fa5031c733d95d319283d6c5 (diff) | |
| parent | ecff5acb5a738fcb4f9e206a12070dac4bf259b3 (diff) | |
| download | ffmpeg-0a946599f881b5129c4af2f4678dca40b6668cc0.tar.gz | |
Merge commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3'
* commit 'ecff5acb5a738fcb4f9e206a12070dac4bf259b3':
svq1dec: clip motion vectors to the frame size.
Conflicts:
libavcodec/svq1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/j2k.c')
0 files changed, 0 insertions, 0 deletions