Commit 497c80a2 authored by Laurent Aimar's avatar Laurent Aimar

Sanitize input headers (pass 3).

parent 59091272
......@@ -306,6 +306,7 @@ SOURCES_libvlc_common = \
input/es_out.c \
input/input.c \
input/meta.c \
input/access.h \
input/clock.h \
input/decoder.h \
input/demux.h \
......
......@@ -26,8 +26,9 @@
#endif
#include <vlc_common.h>
#include <libvlc.h>
#include "input_internal.h"
#include "access.h"
/*****************************************************************************
* access_InternalNew:
......@@ -81,7 +82,6 @@ static access_t *access_InternalNew( vlc_object_t *p_obj, const char *psz_access
if( p_access->p_module == NULL )
{
msg_StackAdd( "could not create access" );
vlc_object_detach( p_access );
free( p_access->psz_access );
free( p_access->psz_path );
......
......@@ -29,7 +29,7 @@
#ifndef _INPUT_DEMUX_H
#define _INPUT_DEMUX_H 1
#include <vlc_common.h>
#include <libvlc.h>
#include <vlc_demux.h>
/* stream_t *s could be null and then it mean a access+demux in one */
......
......@@ -37,6 +37,7 @@
#include "input_internal.h"
#include "es_out.h"
#include "access.h"
#include "demux.h"
#include <vlc_sout.h>
......
......@@ -372,15 +372,6 @@ char *input_CreateFilename( vlc_object_t *p_obj, const char *psz_path, const cha
#define INPUT_RECORD_PREFIX "vlc-record-%Y-%m-%d-%H:%M:%S-$ N-$ p"
/* Access */
#define access_New( a, b, c, d ) __access_New(VLC_OBJECT(a), b, c, d )
access_t * __access_New( vlc_object_t *p_obj, const char *psz_access,
const char *psz_demux, const char *psz_path );
access_t * access_FilterNew( access_t *p_source,
const char *psz_access_filter );
void access_Delete( access_t * );
/* Stream */
/**
* stream_t definition
......
......@@ -35,6 +35,7 @@
#include <assert.h>
#include "input_internal.h"
#include "access.h"
#undef STREAM_DEBUG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment