summaryrefslogtreecommitdiff
path: root/src/libreal
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-06 21:38:54 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-06 21:38:54 +0200
commit2839776b4fe1c282f3f2938d52408a51ca6def96 (patch)
treec3fb4489f4b8f5c8c650f772e864984d8c32e50c /src/libreal
parenta800128f70a60ab7544d4ed4d3bf101c3d1839d2 (diff)
parent6ca146bc0ffc2825402a8fb39b156394a614c1f0 (diff)
downloadxine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.gz
xine-lib-2839776b4fe1c282f3f2938d52408a51ca6def96.tar.bz2
Merge changes from main repository.
Diffstat (limited to 'src/libreal')
-rw-r--r--src/libreal/Makefile.am2
-rw-r--r--src/libreal/xine_real_audio_decoder.c (renamed from src/libreal/audio_decoder.c)0
-rw-r--r--src/libreal/xine_real_video_decoder.c (renamed from src/libreal/xine_decoder.c)0
3 files changed, 1 insertions, 1 deletions
diff --git a/src/libreal/Makefile.am b/src/libreal/Makefile.am
index 114a473a7..c9cf62984 100644
--- a/src/libreal/Makefile.am
+++ b/src/libreal/Makefile.am
@@ -4,7 +4,7 @@ if ENABLE_REAL
xineplug_LTLIBRARIES = xineplug_decode_real.la
endif
-xineplug_decode_real_la_SOURCES = xine_decoder.c real_common.c audio_decoder.c
+xineplug_decode_real_la_SOURCES = xine_real_video_decoder.c real_common.c xine_real_audio_decoder.c
xineplug_decode_real_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS)
xineplug_decode_real_la_CFLAGS = $(VISIBILITY_FLAG)
xineplug_decode_real_la_LDFLAGS = $(xineplug_ldflags)
diff --git a/src/libreal/audio_decoder.c b/src/libreal/xine_real_audio_decoder.c
index d1bb94230..d1bb94230 100644
--- a/src/libreal/audio_decoder.c
+++ b/src/libreal/xine_real_audio_decoder.c
diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_real_video_decoder.c
index ea1fc8c54..ea1fc8c54 100644
--- a/src/libreal/xine_decoder.c
+++ b/src/libreal/xine_real_video_decoder.c