Commit 361829e7 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Add avparser.h to prepare for submodulification

parent cbf5dbd5
......@@ -70,6 +70,7 @@ static const char *const enc_hq_list_text[] = {
#ifdef MERGE_FFMPEG
# include "../../demux/avformat/avformat.h"
# include "../../access/avio.h"
# include "../../packetizer/avparser.h"
#endif
/*****************************************************************************
......@@ -238,6 +239,8 @@ vlc_module_begin ()
# include "../../demux/avformat/avformat.c"
add_submodule ()
AVIO_MODULE
add_submodule ()
AVPARSER_MODULE
#endif
vlc_module_end ()
......
......@@ -14,6 +14,7 @@ libpacketizer_flac_plugin_la_SOURCES = packetizer/flac.c
libpacketizer_hevc_plugin_la_SOURCES = packetizer/hevc.c
libpacketizer_avparser_plugin_la_SOURCES = packetizer/avparser.c \
packetizer/avparser.h \
codec/avcodec/avcommon.h \
codec/avcodec/avcodec.h \
codec/avcodec/fourcc.c
......
......@@ -37,19 +37,15 @@
#include "../codec/avcodec/avcodec.h"
#include "../codec/avcodec/avcommon.h"
#include "avparser.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int OpenPacketizer ( vlc_object_t * );
static void ClosePacketizer( vlc_object_t * );
#ifndef MERGE_FFMPEG
vlc_module_begin ()
set_category( CAT_SOUT )
set_subcategory( SUBCAT_SOUT_PACKETIZER )
set_description( N_("avparser packetizer") )
set_capability( "packetizer", 1 )
set_callbacks( OpenPacketizer, ClosePacketizer )
AVPARSER_MODULE
vlc_module_end ()
#endif
/*****************************************************************************
* Local prototypes
......@@ -69,7 +65,7 @@ static block_t * Packetize( decoder_t *, block_t ** );
* Tries to launch a decoder and return score so that the interface is able
* to choose.
*****************************************************************************/
static int OpenPacketizer( vlc_object_t *p_this )
int OpenPacketizer( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
......@@ -125,7 +121,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
/*****************************************************************************
* ClosePacketizer:
*****************************************************************************/
static void ClosePacketizer( vlc_object_t *p_this )
void ClosePacketizer( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
avcodec_free_context( &p_dec->p_sys->p_codec_ctx );
......
/*****************************************************************************
* avparser.h
*****************************************************************************
* Copyright (C) 2015 VLC authors and VideoLAN
* $Id$
*
* Authors: Denis Charmet <typx@videolan.org>
*
* 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.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_block.h>
#include "../codec/avcodec/avcodec.h"
#include "../codec/avcodec/avcommon.h"
/*****************************************************************************
* Module descriptor
*****************************************************************************/
int OpenPacketizer ( vlc_object_t * );
void ClosePacketizer( vlc_object_t * );
#define AVPARSER_MODULE \
set_category( CAT_SOUT ) \
set_subcategory( SUBCAT_SOUT_PACKETIZER ) \
set_description( N_("avparser packetizer") ) \
set_capability( "packetizer", 1 ) \
set_callbacks( OpenPacketizer, ClosePacketizer )
......@@ -998,7 +998,7 @@ modules/mux/ogg.c
modules/mux/wav.c
modules/notify/growl.m
modules/notify/notify.c
modules/packetizer/avparser.c
modules/packetizer/avparser.h
modules/packetizer/copy.c
modules/packetizer/dirac.c
modules/packetizer/flac.c
......
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