From 928853f57f548b9a301811cf374b9a4889b68f17 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Fri, 13 Jan 2006 15:37:53 +0000 Subject: - revert changes from 2005-12-17, throw is failed with other plugins thats use ffmpeg --- HISTORY | 3 +++ liboutput/encode.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/HISTORY b/HISTORY index 8575428..da30f01 100644 --- a/HISTORY +++ b/HISTORY @@ -1,6 +1,9 @@ VDR Plugin 'image' Revision History ----------------------------------- +2006-01-13 +- revert changes from 2005-12-17, throw is failed with other plugins thats use ffmpeg + 2006-01-12 - fix build failed without defined FFMDIR - add exif support (required libexif) diff --git a/liboutput/encode.c b/liboutput/encode.c index 505d478..ac8e01d 100644 --- a/liboutput/encode.c +++ b/liboutput/encode.c @@ -62,7 +62,13 @@ cEncode::cEncode() bool cEncode::Register() { avcodec_init(); +#if 0 + // XXX to resolv: dosen't work with osdpip register_avcodec(&mpeg2video_encoder); +#else + avcodec_register_all(); +#endif + return true; } -- cgit v1.2.3