summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2013-06-27 09:02:08 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2013-06-27 09:02:08 +0800
commit908f6a7e6bdd162b40d83279a54195652339ecdf (patch)
treedf546c99a4b123e3ea7512af743f522cd4ddb72d
parentf53f45154bef10568e621f7f385c2d2531c10eee (diff)
tests: rename mpeg2enc to mpeg2vaenc
This fixes namespace issue with mpeg2enc from the mjpegtools. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=66221 Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
-rw-r--r--test/encode/Makefile.am8
-rw-r--r--test/encode/mpeg2vaenc.c (renamed from test/encode/mpeg2enc.c)0
2 files changed, 4 insertions, 4 deletions
diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am
index 8391f5b..6ecf53e 100644
--- a/test/encode/Makefile.am
+++ b/test/encode/Makefile.am
@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-bin_PROGRAMS = avcenc mpeg2enc h264encode
+bin_PROGRAMS = avcenc mpeg2vaenc h264encode
AM_CPPFLAGS = \
-Wall \
@@ -42,9 +42,9 @@ avcenc_LDADD = \
$(top_builddir)/test/common/libva-display.la \
-lpthread
-mpeg2enc_SOURCES = mpeg2enc.c
-mpeg2enc_CFLAGS = -I$(top_srcdir)/test/common
-mpeg2enc_LDADD = \
+mpeg2vaenc_SOURCES = mpeg2vaenc.c
+mpeg2vaenc_CFLAGS = -I$(top_srcdir)/test/common
+mpeg2vaenc_LDADD = \
$(top_builddir)/va/libva.la \
$(top_builddir)/test/common/libva-display.la \
-lpthread
diff --git a/test/encode/mpeg2enc.c b/test/encode/mpeg2vaenc.c
index 0721b08..0721b08 100644
--- a/test/encode/mpeg2enc.c
+++ b/test/encode/mpeg2vaenc.c