aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/motion_est_template.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-01 09:51:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-01 09:51:37 +0200
commitd8b6557c866d268745123cbdd6e5431ed9261b96 (patch)
treed4dc27854add9d3bacc3363f795182b171195857 /libavcodec/motion_est_template.c
parent71091698a231ca63984b2612bf16a126e6de5054 (diff)
parentbda9e6d923df6d46cc5cafb30a59a01d2514fa61 (diff)
downloadffmpeg-d8b6557c866d268745123cbdd6e5431ed9261b96.tar.gz
Merge commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61'
* commit 'bda9e6d923df6d46cc5cafb30a59a01d2514fa61': indeo3: use put_pixels instead of put_no_rnd_pixels in copy_cell() Conflicts: libavcodec/indeo3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est_template.c')
0 files changed, 0 insertions, 0 deletions