From 53b36fa3a7c359bc2f4c2f3c592ebb9def7dedb3 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 24 Sep 2012 14:12:34 +0200
Subject: [PATCH] Update NEWS, po, LIST for smooth streaming

And cosmetics
---
 NEWS                      |  1 +
 modules/LIST              |  5 ++++-
 modules/access/Modules.am | 18 +++++++++---------
 po/POTFILES.in            |  1 +
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 59795fbeb7..216cc1d32c 100644
--- a/NEWS
+++ b/NEWS
@@ -27,6 +27,7 @@ Access:
  * Improvements in Blu-Ray module, notably for multiple video tracks support
  * Important improvements and rewrite of the v4l2 access module
  * HTTP: support for Internationalized Domain Names
+ * Microsoft Smooth Streaming support (H264 and VC1) developped by Viotech.net
 
 Demuxers:
  * MP4: partial support for fragmented MP4
diff --git a/modules/LIST b/modules/LIST
index b7ec0f38e3..100375f292 100644
--- a/modules/LIST
+++ b/modules/LIST
@@ -35,6 +35,7 @@ $Id$
  * adpcm: ADPCM audio decoder
  * adummy: dummy audio output
  * aes3: aes3 decoder/packetizer
+ * afile: Audio output to write to a file
  * aiff: AIFF demuxer
  * alphamask: Alpha layer mask video filter
  * alsa: audio output module using the ALSA API
@@ -42,7 +43,6 @@ $Id$
  * anaglyph: anaglyph 3d video filter
  * android_surface: video output for Android, based on Surface
  * antiflicker: anti-flicker video filter
- * aout_file: Audio output to write to a file
  * araw: Pseudo audio decoder for raw PCM
  * asf: ASF demuxer
  * atmo: Ambilight-like video-output
@@ -291,6 +291,7 @@ $Id$
  * simple_channel_mixer: channel mixer
  * skins2: Skinnable interface, new generation
  * smf: Standard MIDI file demuxer
+ * smooth: Microsoft Smooth Streaming input
  * sndio: OpenBSD sndio audio output
  * spatializer: A spatializer audio filter
  * speex: a speex audio decoder/packetizer using the libspeex library
@@ -341,6 +342,7 @@ $Id$
  * ty: TY demuxer
  * udev: udev probing module
  * ugly_resampler: Ugly audio resampler
+ * uleaddvaudio: codec for DV Audio from Ulead
  * upnp: libupnp UPNP service discovery
  * v4l2: Video 4 Linux 2 input module
  * vc1: VC-1 Video demuxer
@@ -352,6 +354,7 @@ $Id$
  * vobsub: VobSUB subtitles demuxer
  * voc: VOC demuxer
  * vod_rtsp: RTSP VoD module
+ * volume_neon: audio volume optimized for ARM NEON
  * vorbis: a vorbis audio decoder/packetizer using the libvorbis library
  * vout_ios: iOS video output
  * vout_macosx: MacOS X OpenGL provider
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 84fafa8cee..5665477d46 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -258,25 +258,25 @@ SOURCES_htcpcp = htcpcp.c
 SOURCES_access_ftp = ftp.c
 SOURCES_access_sftp = sftp.c
 
-libmms_plugin_la_SOURCES = \
+libaccess_mms_plugin_la_SOURCES = \
 	mms/mms.c mms/mms.h \
 	mms/mmsh.c mms/mmsh.h \
 	mms/mmstu.c mms/mmstu.h \
 	mms/buffer.c mms/buffer.h \
 	mms/asf.h mms/asf.c \
 	../demux/asf/libasf_guid.h
-libmms_plugin_la_CFLAGS = $(AM_CFLAGS)
-libmms_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
-libvlc_LTLIBRARIES += libmms_plugin.la
+libaccess_mms_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_mms_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += libaccess_mms_plugin.la
 
-librealrtsp_plugin_la_SOURCES = \
+libaccess_realrtsp_plugin_la_SOURCES = \
 	rtsp/access.c \
 	rtsp/rtsp.c rtsp/rtsp.h \
 	rtsp/real.c rtsp/real.h \
 	rtsp/real_rmff.c rtsp/real_rmff.h \
 	rtsp/real_sdpplin.c rtsp/real_sdpplin.h \
 	rtsp/real_asmrp.c
-librealrtsp_plugin_la_CFLAGS = $(AM_CFLAGS)
-librealrtsp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
-libvlc_LTLIBRARIES += $(LTLIBrealrtsp)
-EXTRA_LTLIBRARIES += librealrtsp_plugin.la
+libaccess_realrtsp_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_realrtsp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBaccess_realrtsp)
+EXTRA_LTLIBRARIES += libaccess_realrtsp_plugin.la
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 12e13bf967..9dee7c063d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -972,6 +972,7 @@ modules/stream_filter/dash/dash.cpp
 modules/stream_filter/decomp.c
 modules/stream_filter/httplive.c
 modules/stream_filter/record.c
+modules/stream_filter/smooth/smooth.c
 modules/stream_out/autodel.c
 modules/stream_out/bridge.c
 modules/stream_out/delay.c
-- 
2.39.2