aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/des.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-17 15:52:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-17 15:52:10 +0200
commit0a946599f881b5129c4af2f4678dca40b6668cc0 (patch)
tree6ec77ab443ef7ce9ac0610bf83c95d2376ea2452 /libavutil/des.h
parent251f283b9d1bbec2fa5031c733d95d319283d6c5 (diff)
parentecff5acb5a738fcb4f9e206a12070dac4bf259b3 (diff)
downloadffmpeg-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 'libavutil/des.h')
0 files changed, 0 insertions, 0 deletions