summaryrefslogtreecommitdiffstats
path: root/libavcodec/h264_picture.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-27 22:34:10 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-27 22:34:16 +0200
commit43c57dbe14545d13dbfd8aae341b45514e8bcfbb (patch)
treed56f6c1e5688c8a701a86def28f5403006f29a3c /libavcodec/h264_picture.c
parentd84286b1ea1a59ecc770666a665ce71aa1e75c8f (diff)
parent888dcd86755d37e55fd74166f6d38ad66d41db58 (diff)
downloadffmpeg-streaming-43c57dbe14545d13dbfd8aae341b45514e8bcfbb.zip
ffmpeg-streaming-43c57dbe14545d13dbfd8aae341b45514e8bcfbb.tar.gz
Merge commit '888dcd86755d37e55fd74166f6d38ad66d41db58'
* commit '888dcd86755d37e55fd74166f6d38ad66d41db58': h264_picture: Remove pointless dsputil.h #include Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_picture.c')
-rw-r--r--libavcodec/h264_picture.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index e482875..b6b6d45 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"
OpenPOWER on IntegriCloud