aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/hevcdsp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-22 12:43:43 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-22 12:46:19 +0100
commit5410a5dc660858920d58a5f09daba264f370f81c (patch)
tree6d53029cca96abaafad84c01ac3124647dc3b696 /libavcodec/hevcdsp.c
parent6fe5f770db3ac2a5fb77d2f3bb4eb977be440bbd (diff)
parent7398e0516f7fdf98e74e5ce8966ac02c28aba754 (diff)
downloadffmpeg-5410a5dc660858920d58a5f09daba264f370f81c.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: hevc: move DSP declarations from hevc.h into hevcdsp.h Conflicts: libavcodec/hevc.h libavcodec/hevcdsp.c libavcodec/hevcdsp.h See: c8dd048ab8cff815c9f4b16a62db0b74df011f0a Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevcdsp.c')
-rw-r--r--libavcodec/hevcdsp.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c
index b3abc9d8a5..be44bc9955 100644
--- a/libavcodec/hevcdsp.c
+++ b/libavcodec/hevcdsp.c
@@ -20,7 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "hevc.h"
#include "hevcdsp.h"
static const int8_t transform[32][32] = {