diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 13:05:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 13:05:10 +0100 |
| commit | a984efd104cc3f4ab7f7209fa1b1bab6a44720db (patch) | |
| tree | a0d9d5e407432f97249232898b45585fee399fa1 /libavcodec/arm | |
| parent | 9b1a0c2ee82f3b99584857db1ea662e2d08aca7f (diff) | |
| parent | c242bbd8b6939507a1a6fb64101b0553d92d303f (diff) | |
| download | ffmpeg-a984efd104cc3f4ab7f7209fa1b1bab6a44720db.tar.gz | |
Merge commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f'
* commit 'c242bbd8b6939507a1a6fb64101b0553d92d303f':
Remove unnecessary dsputil.h #includes
Conflicts:
libavcodec/ffv1.c
libavcodec/h261dec.c
libavcodec/h261enc.c
libavcodec/h264pred.c
libavcodec/lpc.h
libavcodec/mjpegdec.c
libavcodec/rectangle.h
libavcodec/x86/idct_sse2_xvid.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/dsputil_init_arm.c | 1 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv5te.c | 1 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_armv6.c | 1 | ||||
| -rw-r--r-- | libavcodec/arm/dsputil_init_neon.c | 1 | ||||
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 1 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_arm.c | 1 | ||||
| -rw-r--r-- | libavcodec/arm/mpegvideo_armv5te.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/libavcodec/arm/dsputil_init_arm.c b/libavcodec/arm/dsputil_init_arm.c index 216cd2b573..a6725f370c 100644 --- a/libavcodec/arm/dsputil_init_arm.c +++ b/libavcodec/arm/dsputil_init_arm.c @@ -21,7 +21,6 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_j_rev_dct_arm(int16_t *data); diff --git a/libavcodec/arm/dsputil_init_armv5te.c b/libavcodec/arm/dsputil_init_armv5te.c index 33d7970e68..841fbfadcd 100644 --- a/libavcodec/arm/dsputil_init_armv5te.c +++ b/libavcodec/arm/dsputil_init_armv5te.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_simple_idct_armv5te(int16_t *data); diff --git a/libavcodec/arm/dsputil_init_armv6.c b/libavcodec/arm/dsputil_init_armv6.c index 9fd33f935b..3e7aa37b9d 100644 --- a/libavcodec/arm/dsputil_init_armv6.c +++ b/libavcodec/arm/dsputil_init_armv6.c @@ -21,7 +21,6 @@ #include <stdint.h> #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_simple_idct_armv6(int16_t *data); diff --git a/libavcodec/arm/dsputil_init_neon.c b/libavcodec/arm/dsputil_init_neon.c index 4e44034e06..5555bc8e74 100644 --- a/libavcodec/arm/dsputil_init_neon.c +++ b/libavcodec/arm/dsputil_init_neon.c @@ -23,7 +23,6 @@ #include "libavutil/attributes.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "dsputil_arm.h" void ff_simple_idct_neon(int16_t *data); diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index e08e87e125..785b604749 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" -#include "libavcodec/dsputil.h" #include "libavcodec/h264dsp.h" void ff_h264_v_loop_filter_luma_neon(uint8_t *pix, int stride, int alpha, diff --git a/libavcodec/arm/mpegvideo_arm.c b/libavcodec/arm/mpegvideo_arm.c index 47d4f1826a..656679809b 100644 --- a/libavcodec/arm/mpegvideo_arm.c +++ b/libavcodec/arm/mpegvideo_arm.c @@ -20,7 +20,6 @@ #include "libavutil/arm/cpu.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "mpegvideo_arm.h" #include "asm-offsets.h" diff --git a/libavcodec/arm/mpegvideo_armv5te.c b/libavcodec/arm/mpegvideo_armv5te.c index 1765a65a6b..a5722900a8 100644 --- a/libavcodec/arm/mpegvideo_armv5te.c +++ b/libavcodec/arm/mpegvideo_armv5te.c @@ -22,7 +22,6 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavcodec/avcodec.h" -#include "libavcodec/dsputil.h" #include "libavcodec/mpegvideo.h" #include "mpegvideo_arm.h" |