Commit 73639ea0 authored by Thomas Guillem's avatar Thomas Guillem

move codec/mpeg_audio to packetizer/mpegaudio

("_" is removed to be more consistent with packetizer/mpegvideo)
parent 9ee82012
......@@ -510,7 +510,7 @@ libmod
libdash
libmpgv
dolby_surround
mpeg_audio"
mpegaudio"
fi
echo ${blacklist}
......
......@@ -1039,7 +1039,6 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
%_vlc_pluginsdir/codec/libcinepak_plugin.so*
%_vlc_pluginsdir/codec/libdts_plugin.so*
%_vlc_pluginsdir/codec/liblpcm_plugin.so*
%_vlc_pluginsdir/codec/libmpeg_audio_plugin.so*
%_vlc_pluginsdir/codec/libspudec_plugin.so*
%_vlc_pluginsdir/codec/libfake_plugin.so*
%_vlc_pluginsdir/codec/libsubsdec_plugin.so*
......@@ -1138,7 +1137,7 @@ strfile %buildroot%_gamesdatadir/fortune/vlc %buildroot%_gamesdatadir/fortune/vl
%_vlc_pluginsdir/packetizer/libpacketizer_copy_plugin.so*
%_vlc_pluginsdir/packetizer/libpacketizer_mpeg4audio_plugin.so*
%_vlc_pluginsdir/packetizer/libpacketizer_mpeg4video_plugin.so*
#%_vlc_pluginsdir/packetizer/libpacketizer_mpegaudio_plugin.so*
%_vlc_pluginsdir/packetizer/libpacketizer_mpegaudio_plugin.so*
%_vlc_pluginsdir/packetizer/libpacketizer_mpegvideo_plugin.so*
%_vlc_pluginsdir/packetizer/libpacketizer_vc1_plugin.so*
......
......@@ -244,7 +244,6 @@ $Id$
* motiondetect: Motion detection filter
* mp4: MP4 file input module
* mpc: Musepack decoder
* mpeg_audio: MPEG audio parser/packetizer
* mpg123: MPEG-1 & 2 audio layer I, II, III + MPEG 2.5 decoder using mpg123
* mpgv: MPEG-I/II Video demuxer
* mtp: MTP interface module
......@@ -291,6 +290,7 @@ $Id$
* packetizer_mlp: MLP/TrueHD audio packetizer
* packetizer_mpeg4audio: MPEG4 audio packetizer
* packetizer_mpeg4video: MPEG4 video packetizer
* packetizer_mpegaudio: MPEG audio packetizer
* packetizer_mpegvideo: MPEG video packetizer
* packetizer_vc1: VC-1 video packetizer
* panoramix: image wall panoramic video with edge blending filter
......
......@@ -63,10 +63,6 @@ endif
liblpcm_plugin_la_SOURCES = codec/lpcm.c
codec_LTLIBRARIES += liblpcm_plugin.la
libmpeg_audio_plugin_la_SOURCES = codec/mpeg_audio.c
libmpeg_audio_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
codec_LTLIBRARIES += libmpeg_audio_plugin.la
libmad_plugin_la_SOURCES = codec/mad.c
libmad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(MAD_CFLAGS)
libmad_plugin_la_LIBADD = $(AM_LIBADD) $(MAD_LIBS)
......
......@@ -4,6 +4,7 @@ libpacketizer_copy_plugin_la_SOURCES = packetizer/copy.c
libpacketizer_mpegvideo_plugin_la_SOURCES = packetizer/mpegvideo.c
libpacketizer_mpeg4video_plugin_la_SOURCES = packetizer/mpeg4video.c
libpacketizer_mpeg4audio_plugin_la_SOURCES = packetizer/mpeg4audio.c
libpacketizer_mpegaudio_plugin_la_SOURCES = packetizer/mpegaudio.c
libpacketizer_h264_plugin_la_SOURCES = \
packetizer/h264_nal.c packetizer/h264_nal.h \
packetizer/h264.c packetizer/hxxx_nal.h \
......@@ -37,6 +38,7 @@ packetizer_LTLIBRARIES = \
libpacketizer_mpegvideo_plugin.la \
libpacketizer_mpeg4video_plugin.la \
libpacketizer_mpeg4audio_plugin.la \
libpacketizer_mpegaudio_plugin.la \
libpacketizer_h264_plugin.la \
libpacketizer_vc1_plugin.la \
libpacketizer_mlp_plugin.la \
......
/*****************************************************************************
* mpeg_audio.c: parse MPEG audio sync info and packetize the stream
* mpegaudio.c: parse MPEG audio sync info and packetize the stream
*****************************************************************************
* Copyright (C) 2001-2016 VLC authors and VideoLAN
* $Id$
......@@ -40,7 +40,7 @@
#include <vlc_block_helper.h>
#include "../packetizer/packetizer_helper.h"
#include "packetizer_helper.h"
/*****************************************************************************
* decoder_sys_t : decoder descriptor
......
......@@ -373,7 +373,6 @@ modules/codec/libmpeg2.c
modules/codec/lpcm.c
modules/codec/mad.c
modules/codec/mft.c
modules/codec/mpeg_audio.c
modules/codec/mpg123.c
modules/codec/omxil/mediacodec.c
modules/codec/omxil/mediacodec_jni.c
......@@ -1015,6 +1014,7 @@ modules/packetizer/hevc.c
modules/packetizer/mlp.c
modules/packetizer/mpeg4audio.c
modules/packetizer/mpeg4video.c
modules/packetizer/mpegaudio.c
modules/packetizer/mpegvideo.c
modules/packetizer/vc1.c
modules/services_discovery/avahi.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