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/h264pred.c | |
| parent | 9b1a0c2ee82f3b99584857db1ea662e2d08aca7f (diff) | |
| parent | c242bbd8b6939507a1a6fb64101b0553d92d303f (diff) | |
| download | ffmpeg-streaming-a984efd104cc3f4ab7f7209fa1b1bab6a44720db.zip ffmpeg-streaming-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/h264pred.c')
| -rw-r--r-- | libavcodec/h264pred.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 1339b2a..e5f1f5a 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -26,8 +26,8 @@ */ #include "libavutil/avassert.h" +#include "dsputil.h" #include "h264pred.h" -#include "dsputil.h" // for ff_cropTbl #include "avcodec.h" // for AV_CODEC_ID_* #define BIT_DEPTH 8 |
