[vlc-commits] Revert "modules: x265 is a C++ module"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct  8 10:48:51 2017 +0300| [0c98ed76b0250ebc25ff7bb981117b1d99bd2ce6] | committer: Rémi Denis-Courmont

Revert "modules: x265 is a C++ module"

This reverts commit a1f9dfd57c84f2340755443200e6f03d2c895548.
This fixes linking.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c98ed76b0250ebc25ff7bb981117b1d99bd2ce6
---

 modules/codec/Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index da49a0704f..10eb160d36 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -475,9 +475,9 @@ endif
 
 ### X26x encoders ###
 
-libx265_plugin_la_SOURCES = codec/x265.c dummy.cpp
+libx265_plugin_la_SOURCES = codec/x265.c
 libx265_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-libx265_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CFLAGS_x265)
+libx265_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x265)
 libx265_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x265) -rpath '$(codecdir)'
 libx265_plugin_la_LIBADD = $(LIBS_x265)
 EXTRA_LTLIBRARIES += libx265_plugin.la