diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 18:48:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 18:54:15 +0200 |
| commit | 5440151fa42d4e18c83bc42ff31526680697e645 (patch) | |
| tree | 43851c2293c5cc89326ef227674a0f059290e904 /libavcodec/h264pred.c | |
| parent | a1ac12bddd8ddb184281eadf5431dce29c02f27a (diff) | |
| parent | 3dc6272bed7890a49080e18eacf3c7a4a6594b0d (diff) | |
| download | ffmpeg-streaming-5440151fa42d4e18c83bc42ff31526680697e645.zip ffmpeg-streaming-5440151fa42d4e18c83bc42ff31526680697e645.tar.gz | |
Merge commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d'
* commit '3dc6272bed7890a49080e18eacf3c7a4a6594b0d':
Remove a number of unnecessary dsputil.h #includes
Conflicts:
libavcodec/h264pred.c
libavcodec/vc1dsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264pred.c')
| -rw-r--r-- | libavcodec/h264pred.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c index 37ac56b..044fc90 100644 --- a/libavcodec/h264pred.c +++ b/libavcodec/h264pred.c @@ -27,9 +27,9 @@ #include "libavutil/attributes.h" #include "libavutil/avassert.h" -#include "dsputil.h" +#include "libavutil/intreadwrite.h" +#include "avcodec.h" #include "h264pred.h" -#include "avcodec.h" // for AV_CODEC_ID_* #define BIT_DEPTH 8 #include "h264pred_template.c" |
