Merge with main repository.

--HG--
rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c
rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h
rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c

9 files changed, 16 insertions, 19 deletions

diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 32a6072c5..864f5bacf 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -26,33 +26,30 @@ endif
 DISTCLEANFILES = ffmpeg_config.h
 
 # this must always be included, even if the current machine has no DXR3...
-EXTRA_DIST = xine_encoder.c diff_to_ffmpeg_cvs.txt
+EXTRA_DIST = ffmpeg_encoder.c diff_to_ffmpeg_cvs.txt
 
 INTERNAL_DOCS = diff_to_ffmpeg_cvs.txt
 
-libdir = $(XINE_PLUGINDIR)
-
-lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
+xineplug_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
 
 if HAVE_DXR3
 AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \
               $(ZLIB_CPPFLAGS)
-xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
-                                xine_encoder.c mpeg_parser.c
+xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_decoder.c \
+                                ffmpeg_encoder.c ff_mpeg_parser.c ffmpeg_decoder.h \
+				ff_mpeg_parser.h
 else
 AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS)
-xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \
-                                mpeg_parser.c
+xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_decoder.c \
+                                ff_mpeg_parser.c ffmpeg_decoder.h ff_mpeg_parser.h
 endif
 
 xineplug_decode_ff_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
-xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @IMPURE_TEXT_LDFLAGS@
+xineplug_decode_ff_la_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS)
 xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
 	$(link_ffmpeg) $(PTHREAD_LIBS)
 
 xineplug_decode_dvaudio_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
-xineplug_decode_dvaudio_la_LDFLAGS = -avoid-version -module
-xineplug_decode_dvaudio_la_SOURCES = dvaudio_decoder.c
+xineplug_decode_dvaudio_la_LDFLAGS = $(xineplug_ldflags)
+xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
 xineplug_decode_dvaudio_la_LIBADD  = $(XINE_LIB)
-
-noinst_HEADERS = xine_decoder.h mpeg_parser.h
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c
index 7ab1f56b4..e0d6e5cab 100644
--- a/src/libffmpeg/audio_decoder.c
+++ b/src/libffmpeg/ff_audio_decoder.c
@@ -45,7 +45,7 @@
 #include "buffer.h"
 #include "xineutils.h"
 #include "bswap.h"
-#include "xine_decoder.h"
+#include "ffmpeg_decoder.h"
 
 #define AUDIOBUFSIZE (64 * 1024)
 
diff --git a/src/libffmpeg/dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c
index 985165611..985165611 100644
--- a/src/libffmpeg/dvaudio_decoder.c
+++ b/src/libffmpeg/ff_dvaudio_decoder.c
diff --git a/src/libffmpeg/mpeg_parser.c b/src/libffmpeg/ff_mpeg_parser.c
index 14a08a456..fcee29a80 100644
--- a/src/libffmpeg/mpeg_parser.c
+++ b/src/libffmpeg/ff_mpeg_parser.c
@@ -27,7 +27,7 @@
 /*
 #define LOG
 */
-#include "mpeg_parser.h"
+#include "ff_mpeg_parser.h"
 
 /* mpeg frame rate table from lavc */
 static const int frame_rate_tab[][2] = {
diff --git a/src/libffmpeg/mpeg_parser.h b/src/libffmpeg/ff_mpeg_parser.h
index 859a0fcec..b307714cc 100644
--- a/src/libffmpeg/mpeg_parser.h
+++ b/src/libffmpeg/ff_mpeg_parser.h
@@ -26,7 +26,7 @@
 #define HAVE_MPEG_PARSER_H
 
 #include "xine_internal.h"
-#include "xine_decoder.h"
+#include "ffmpeg_decoder.h"
 
 #define BUFFER_SIZE (1194 * 1024) /* libmpeg2's buffer size */
 
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index e366a945c..9ae0d791c 100644
--- a/src/libffmpeg/video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -45,8 +45,8 @@
 #include "bswap.h"
 #include "buffer.h"
 #include "xineutils.h"
-#include "xine_decoder.h"
-#include "mpeg_parser.h"
+#include "ffmpeg_decoder.h"
+#include "ff_mpeg_parser.h"
 
 #include <postprocess.h>
 
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/ffmpeg_decoder.c
index 2eeb9746b..6f85cc1fa 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/ffmpeg_decoder.c
@@ -30,7 +30,7 @@
 
 #include "xine_internal.h"
 
-#include "xine_decoder.h"
+#include "ffmpeg_decoder.h"
 
 /*
  * common initialisation
diff --git a/src/libffmpeg/xine_decoder.h b/src/libffmpeg/ffmpeg_decoder.h
index f005f09e5..f005f09e5 100644
--- a/src/libffmpeg/xine_decoder.h
+++ b/src/libffmpeg/ffmpeg_decoder.h
diff --git a/src/libffmpeg/xine_encoder.c b/src/libffmpeg/ffmpeg_encoder.c
index 8db721002..8db721002 100644
--- a/src/libffmpeg/xine_encoder.c
+++ b/src/libffmpeg/ffmpeg_encoder.c