summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Roitzsch <mroi@users.sourceforge.net>2004-12-16 13:31:40 +0000
committerMichael Roitzsch <mroi@users.sourceforge.net>2004-12-16 13:31:40 +0000
commit031c6c1b15e7fff6b46f62763ef73d9d72e82fa2 (patch)
tree3f8a7e616736d68e2cd780e9d84ed1892267e915
parent1c12e1cfa7bcee858319c7dbc49b388e2bb175c7 (diff)
downloadxine-lib-031c6c1b15e7fff6b46f62763ef73d9d72e82fa2.tar.gz
xine-lib-031c6c1b15e7fff6b46f62763ef73d9d72e82fa2.tar.bz2
my sed script for the config entries converted a bit too much which breaks
the DXR3 plugin in 1-rc8; shame on me CVS patchset: 7263 CVS date: 2004/12/16 13:31:40
-rw-r--r--ChangeLog3
-rw-r--r--src/dxr3/dxr3_mpeg_encoders.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 2266f6011..f2f1b4ecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+xine-lib
+ * unbreak DXR3 plugin
+
xine-lib (1-rc8)
* Multiple security vulnerabilities fixed on PNM and Real RTSP clients
* Rewrote OpenGL output plugin.
diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c
index 3e580d2e7..87328ac33 100644
--- a/src/dxr3/dxr3_mpeg_encoders.c
+++ b/src/dxr3/dxr3_mpeg_encoders.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_mpeg_encoders.c,v 1.21 2004/12/12 22:01:04 mroi Exp $
+ * $Id: dxr3_mpeg_encoders.c,v 1.22 2004/12/16 13:31:40 mroi Exp $
*/
/* mpeg encoders for the dxr3 video out plugin.
@@ -550,7 +550,7 @@ int dxr3_lavc_init(dxr3_driver_t *drv, plugin_node_t *node)
ffmpeg = dlopen(node->filename, RTLD_LAZY);
if (!ffmpeg) return 0;
- init = dlsym(ffmpeg, "dxr3.encoding.encoder_init");
+ init = dlsym(ffmpeg, "dxr3_encoder_init");
if (!init) return 0;
result = init(drv);