vlc | branch: master | Francois Cartegnie <[email protected]> | Wed Mar 2 17:57:48 2016 +0100| [5d31d476c72532b96248a2a492d28295b321d911] | committer: Francois Cartegnie
demux: ts: add dedicated header for ts_pid forward decls > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5d31d476c72532b96248a2a492d28295b321d911 --- modules/demux/Makefile.am | 2 +- modules/demux/mpeg/ts_pid.h | 6 +++--- modules/demux/mpeg/ts_pid_fwd.h | 25 +++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am index 11518fe..0b96489 100644 --- a/modules/demux/Makefile.am +++ b/modules/demux/Makefile.am @@ -229,7 +229,7 @@ libplaylist_plugin_la_SOURCES = \ demux_LTLIBRARIES += libplaylist_plugin.la libts_plugin_la_SOURCES = demux/mpeg/ts.c demux/mpeg/ts.h \ - demux/mpeg/ts_pid.h demux/mpeg/ts_pid.c \ + demux/mpeg/ts_pid.h demux/mpeg/ts_pid_fwd.h demux/mpeg/ts_pid.c \ demux/mpeg/ts_psi.h demux/mpeg/ts_psi.c \ demux/mpeg/ts_psi_eit.h demux/mpeg/ts_psi_eit.c \ demux/mpeg/ts_psip.h demux/mpeg/ts_psip.c \ diff --git a/modules/demux/mpeg/ts_pid.h b/modules/demux/mpeg/ts_pid.h index 10fe25a..2034d98 100644 --- a/modules/demux/mpeg/ts_pid.h +++ b/modules/demux/mpeg/ts_pid.h @@ -19,7 +19,7 @@ #ifndef VLC_TS_PID_H #define VLC_TS_PID_H -typedef struct ts_pid_t ts_pid_t; +#include "ts_pid_fwd.h" #define MIN_ES_PID 4 /* Should be 32.. broken muxers */ #define MAX_ES_PID 8190 @@ -76,7 +76,7 @@ struct ts_pid_t }; -typedef struct ts_pid_list_t +struct ts_pid_list_t { ts_pid_t pat; ts_pid_t dummy; @@ -89,7 +89,7 @@ typedef struct ts_pid_list_t uint16_t i_last_pid; ts_pid_t *p_last; -} ts_pid_list_t; +}; /* opacified pid list */ void ts_pid_list_Init( ts_pid_list_t * ); diff --git a/modules/demux/mpeg/ts_pid_fwd.h b/modules/demux/mpeg/ts_pid_fwd.h new file mode 100644 index 0000000..7c810b8 --- /dev/null +++ b/modules/demux/mpeg/ts_pid_fwd.h @@ -0,0 +1,25 @@ +/***************************************************************************** + * ts_pid_fwd.h: Forward declarations for TS pid.h + ***************************************************************************** + * Copyright (C) 2016 VLC authors and VideoLAN + * + * 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 General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + *****************************************************************************/ +#ifndef VLC_TS_PID_FWD_H +#define VLC_TS_PID_FWD_H + +typedef struct ts_pid_t ts_pid_t; +typedef struct ts_pid_list_t ts_pid_list_t; + +#endif // VLC_TS_PID_FWD_H _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
