summaryrefslogtreecommitdiff
path: root/libavcodec/aacenc.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-26 13:05:10 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-26 13:05:10 +0100
commita984efd104cc3f4ab7f7209fa1b1bab6a44720db (patch)
treea0d9d5e407432f97249232898b45585fee399fa1 /libavcodec/aacenc.h
parent9b1a0c2ee82f3b99584857db1ea662e2d08aca7f (diff)
parentc242bbd8b6939507a1a6fb64101b0553d92d303f (diff)
downloadffmpeg-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/aacenc.h')
-rw-r--r--libavcodec/aacenc.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index a2fd351e63..386c72f582 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -25,7 +25,6 @@
#include "libavutil/float_dsp.h"
#include "avcodec.h"
#include "put_bits.h"
-#include "dsputil.h"
#include "aac.h"
#include "audio_frame_queue.h"