[xine-cvs] HG: xine-lib: Simplify

[Petri H. <phi...@us...>]

# HG changeset patch
# User Petri Hintukainen <phi...@us...>
# Date 1326884704 -7200
# Node ID ed106541426845eeb3912a5ff1b5b4ee6910cc59
# Branch  default
# Parent  6ec3fb143fdd64534e312c7b2792208502d78d75
Simplify

diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am
--- a/src/combined/ffmpeg/Makefile.am
+++ b/src/combined/ffmpeg/Makefile.am
@@ -29,16 +29,14 @@
 
 xineplug_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
 
+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
 if HAVE_DXR3
 AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \
               $(ZLIB_CPPFLAGS)
-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
+xineplug_decode_ff_la_SOURCES += ffmpeg_encoder.c
 else
 AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS)
-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)