[vlc-commits] demux: mp4: remove useless header

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Oct 16 19:16:42 2014 +0200| [5495b91f83fd8313b31a522401cfba237af1422d] | committer: Francois Cartegnie

demux: mp4: remove useless header

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

 modules/demux/Makefile.am   |    2 +-
 modules/demux/mp4/essetup.c |    1 -
 modules/demux/mp4/essetup.h |   31 -------------------------------
 modules/demux/mp4/mp4.c     |    1 -
 modules/demux/mp4/mp4.h     |    3 +++
 5 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index db3f1a2..6b874fe 100644
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -193,7 +193,7 @@ libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/mp4.h \
                            demux/mp4/libmp4.c demux/mp4/libmp4.h \
                            demux/mp4/id3genres.h demux/mp4/languages.h \
                            demux/asf/asfpacket.c demux/asf/asfpacket.h \
-                           demux/mp4/essetup.c demus/mp4/essetup.h
+                           demux/mp4/essetup.c
 libmp4_plugin_la_LIBADD = $(LIBM)
 libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 if HAVE_ZLIB
diff --git a/modules/demux/mp4/essetup.c b/modules/demux/mp4/essetup.c
index 1e8c0ef..eadbb89 100644
--- a/modules/demux/mp4/essetup.c
+++ b/modules/demux/mp4/essetup.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "mp4.h"
-#include "essetup.h"
 
 #include <vlc_demux.h>
 #include <vlc_aout.h>
diff --git a/modules/demux/mp4/essetup.h b/modules/demux/mp4/essetup.h
deleted file mode 100644
index a5fdf79..0000000
--- a/modules/demux/mp4/essetup.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*****************************************************************************
- * essetup.h: es setup from stsd and extensions parsing
- *****************************************************************************
- * Copyright (C) 2001-2004, 2010, 2014 VLC authors and VideoLAN
- *
- * Authors: Laurent Aimar <fenrir at via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation; either version 2.1 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
- *****************************************************************************/
-#ifndef _VLC_MP4_ESSETUP_H
-#define _VLC_MP4_ESSETUP_H 1
-
-#include "mp4.h"
-
-int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample );
-int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample );
-int SetupSpuES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample );
-
-#endif
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index a5ffe77..2de32be 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -40,7 +40,6 @@
 #include <assert.h>
 
 #include "id3genres.h"                             /* for ATOM_gnre */
-#include "essetup.h"
 
 /*****************************************************************************
  * Module descriptor
diff --git a/modules/demux/mp4/mp4.h b/modules/demux/mp4/mp4.h
index da164e0..c1945e6 100644
--- a/modules/demux/mp4/mp4.h
+++ b/modules/demux/mp4/mp4.h
@@ -152,4 +152,7 @@ struct mp4_fragment_t
     mp4_fragment_t *p_next;
 };
 
+int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample );
+int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample );
+int SetupSpuES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample );
 #endif