diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:42:36 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-30 00:42:36 +0200 |
commit | 5c6e94c42bcdc026071855a6b1749406b2456c8b (patch) | |
tree | e8ce939224cce418e2069a83f41ad706c3fcd94a /libavcodec/motion_est.c | |
parent | a9a312d299c785b4b4655ab70753aa5a2a933aae (diff) | |
parent | 256da0770e495176d1b2699ec6e9c7993c2a6d7b (diff) | |
download | ffmpeg-5c6e94c42bcdc026071855a6b1749406b2456c8b.tar.gz |
Merge commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b'
* commit '256da0770e495176d1b2699ec6e9c7993c2a6d7b':
dsputil: Move mspel_pixels_tab to the only place it is used
Conflicts:
libavcodec/dsputil.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
0 files changed, 0 insertions, 0 deletions