summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/libffmpeg/Makefile.am5
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b670d24ab..9cff353cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+xine-lib (1-rc0a)
+ * includes ffmpeg's MPEG encode in dist tarball (fixes DXR3 support)
+ * don't abort on MPEG_block stream errors
+
xine-lib (1-rc0)
* improved seeking accuracy of ogg_demuxer
* xine broadcaster (send stream to multiple xine clients simultaneously)
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index 565982fc1..0bf1d8d4b 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -2,9 +2,8 @@ include $(top_srcdir)/misc/Makefile.common
SUBDIRS = libavcodec
-# I don't think this should include internal docs that are not interesting
-# for end users at all... -siggi
-EXTRA_DIST =
+# this must always be included, even if the current machine has no DXR3...
+EXTRA_DIST = xine_decoder.c
INTERNAL_DOCS = diff_to_ffmpeg_cvs.txt