diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 22:34:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-27 22:34:16 +0200 |
| commit | 43c57dbe14545d13dbfd8aae341b45514e8bcfbb (patch) | |
| tree | d56f6c1e5688c8a701a86def28f5403006f29a3c | |
| parent | d84286b1ea1a59ecc770666a665ce71aa1e75c8f (diff) | |
| parent | 888dcd86755d37e55fd74166f6d38ad66d41db58 (diff) | |
| download | ffmpeg-43c57dbe14545d13dbfd8aae341b45514e8bcfbb.tar.gz | |
Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58':
h264_picture: Remove pointless dsputil.h #include
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264_picture.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index e4828758cc..b6b6d45dc9 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -31,7 +31,6 @@ #include "internal.h" #include "cabac.h" #include "cabac_functions.h" -#include "dsputil.h" #include "error_resilience.h" #include "avcodec.h" #include "h264.h" |