summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2006-01-13 15:37:53 +0000
committerAndreas Brachold <vdr07@deltab.de>2006-01-13 15:37:53 +0000
commit928853f57f548b9a301811cf374b9a4889b68f17 (patch)
treee13c66dc0788d7c12970740fe836f66fef3f2056
parent43ce4eb25f4fd149ad0cf28626fe05f529f9a9fc (diff)
downloadvdr-plugin-image-928853f57f548b9a301811cf374b9a4889b68f17.tar.gz
vdr-plugin-image-928853f57f548b9a301811cf374b9a4889b68f17.tar.bz2
- revert changes from 2005-12-17, throw is failed with other plugins thats use ffmpeg
-rw-r--r--HISTORY3
-rw-r--r--liboutput/encode.c6
2 files changed, 9 insertions, 0 deletions
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;
}