summaryrefslogtreecommitdiff
path: root/libavcodec/h264_mc_template.c
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2016-07-29 11:01:36 +0200
committerClément Bœsch <u@pkh.me>2016-07-29 11:01:36 +0200
commit15b26e88cb7c775e0e7a422ab6b088b5690f31ad (patch)
treea5e2705a74a0ef8f98b51d364fb510169cc7607e /libavcodec/h264_mc_template.c
parent7dda97fb86ff615e6a892052545d955816bb58f6 (diff)
parent9df889a5f116c1ee78c2f239e0ba599c492431aa (diff)
downloadffmpeg-15b26e88cb7c775e0e7a422ab6b088b5690f31ad.tar.gz
Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'
* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa': h264: rename h264.[ch] to h264dec.[ch] Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/h264_mc_template.c')
-rw-r--r--libavcodec/h264_mc_template.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c
index cd4a04e082..58c05044c1 100644
--- a/libavcodec/h264_mc_template.c
+++ b/libavcodec/h264_mc_template.c
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "h264.h"
+#include "h264dec.h"
#undef MCFUNC