diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:16:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-09 13:23:59 +0100 |
| commit | b05830169d97f11509a29ed211e79e54f7dece5d (patch) | |
| tree | 901af4cf633015933b9c9fdf4bbb269c2cb108ab /libavcodec/mjpegdec.c | |
| parent | 29a92c01148076cb3f90c132615a5c61e5b0f4ea (diff) | |
| parent | b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a (diff) | |
| download | ffmpeg-b05830169d97f11509a29ed211e79e54f7dece5d.tar.gz | |
Merge commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a'
* commit 'b9ba5253dd1232be4b48cfe61c31ff4b3de3d10a':
dsputil: Move copy_block functions to a separate header
dsputil: Drop unused functions copy_block{2|4|16}
No functions are droped because they are used in several places.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.c')
| -rw-r--r-- | libavcodec/mjpegdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 3b654cebbd..d472436778 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -34,6 +34,7 @@ #include "libavutil/avassert.h" #include "libavutil/opt.h" #include "avcodec.h" +#include "copy_block.h" #include "dsputil.h" #include "internal.h" #include "mjpeg.h" |