[vlc-commits] dts_header: move to packetizer

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Jul 26 09:10:13 2016 +0200| [07eef7df1739fd1ac3f0e4c7f44552c895c620cc] | committer: Thomas Guillem

dts_header: move to packetizer

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

 modules/codec/Makefile.am                  | 2 +-
 modules/codec/dts.c                        | 2 +-
 modules/demux/Makefile.am                  | 4 ++--
 modules/demux/mkv/mkv.cpp                  | 2 +-
 modules/demux/mpeg/es.c                    | 2 +-
 modules/{codec => packetizer}/dts_header.c | 0
 modules/{codec => packetizer}/dts_header.h | 0
 7 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/codec/Makefile.am b/modules/codec/Makefile.am
index ef0aa74..99bb90a 100644
--- a/modules/codec/Makefile.am
+++ b/modules/codec/Makefile.am
@@ -26,7 +26,7 @@ libaraw_plugin_la_SOURCES = codec/araw.c
 libaraw_plugin_la_LIBADD = $(LIBM)
 codec_LTLIBRARIES += libaraw_plugin.la
 
-libdts_plugin_la_SOURCES = codec/dts.c codec/dts_header.c codec/dts_header.h
+libdts_plugin_la_SOURCES = codec/dts.c packetizer/dts_header.c packetizer/dts_header.h
 codec_LTLIBRARIES += libdts_plugin.la
 
 libfaad_plugin_la_SOURCES = codec/faad.c
diff --git a/modules/codec/dts.c b/modules/codec/dts.c
index ff0849d..875109c 100644
--- a/modules/codec/dts.c
+++ b/modules/codec/dts.c
@@ -41,7 +41,7 @@
 #include <vlc_cpu.h>
 
 #include "../packetizer/packetizer_helper.h"
-#include "dts_header.h"
+#include "../packetizer/dts_header.h"
 
 /*****************************************************************************
  * Module descriptor
diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 71fd206..eb24417 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -160,7 +160,7 @@ demux_LTLIBRARIES += libavformat_plugin.la
 endif
 endif
 
-libes_plugin_la_SOURCES  = demux/mpeg/es.c codec/dts_header.c codec/dts_header.h
+libes_plugin_la_SOURCES  = demux/mpeg/es.c packetizer/dts_header.c packetizer/dts_header.h
 demux_LTLIBRARIES += libes_plugin.la
 
 libh26x_plugin_la_SOURCES = demux/mpeg/h26x.c \
@@ -184,7 +184,7 @@ libmkv_plugin_la_SOURCES = \
 	demux/mp4/libmp4.c demux/vobsub.h \
 	demux/mkv/mkv.hpp demux/mkv/mkv.cpp \
 	demux/windows_audio_commons.h
-libmkv_plugin_la_SOURCES += codec/dts_header.h codec/dts_header.c
+libmkv_plugin_la_SOURCES += packetizer/dts_header.h packetizer/dts_header.c
 libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
 libmkv_plugin_la_LIBADD = $(LIBS_mkv)
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 3e39908..ff5b9da 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -36,7 +36,7 @@
 #include <new>
 
 extern "C" {
-#include "../../modules/codec/dts_header.h"
+#include "../../packetizer/dts_header.h"
 }
 
 #include <vlc_fs.h>
diff --git a/modules/demux/mpeg/es.c b/modules/demux/mpeg/es.c
index 69785be..12af7ef 100644
--- a/modules/demux/mpeg/es.c
+++ b/modules/demux/mpeg/es.c
@@ -38,7 +38,7 @@
 #include <vlc_input.h>
 
 #include "../../packetizer/a52.h"
-#include "../../codec/dts_header.h"
+#include "../../packetizer/dts_header.h"
 
 /*****************************************************************************
  * Module descriptor
diff --git a/modules/codec/dts_header.c b/modules/packetizer/dts_header.c
similarity index 100%
rename from modules/codec/dts_header.c
rename to modules/packetizer/dts_header.c
diff --git a/modules/codec/dts_header.h b/modules/packetizer/dts_header.h
similarity index 100%
rename from modules/codec/dts_header.h
rename to modules/packetizer/dts_header.h