summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2007-12-07 00:38:41 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2007-12-07 00:38:41 +0000
commite439a7fea30aab82fc5b704d9afdf3e63795464a (patch)
tree43e91b3cc4a9cca9fe48d4a636b7fc843f627f31
parent0aa00fb217357cee4ef1008677e1247bb24eb42c (diff)
downloadxine-lib-e439a7fea30aab82fc5b704d9afdf3e63795464a.tar.gz
xine-lib-e439a7fea30aab82fc5b704d9afdf3e63795464a.tar.bz2
Fix compilation of DXR3 support with external ffmpeg. Untested with actual DXR3.
Compilation was "broken" by ffmpeg rev. 9283.
-rw-r--r--ChangeLog2
-rw-r--r--src/libffmpeg/ffmpeg_encoder.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 97dd87f94..d2f98b32d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,8 @@ xine-lib (1.1.9) (unreleased)
but not played yet.
* Fixed a race condition between ao_loop and ao_close to not lose the last
buffer.
+ * DXR3 encoding with external ffmpeg should be fixed now.
+ (This was broken by ffmpeg revision 9283).
xine-lib (1.1.8)
* Send a channel-changed event to the frontend when receiving the SYNC
diff --git a/src/libffmpeg/ffmpeg_encoder.c b/src/libffmpeg/ffmpeg_encoder.c
index 35c47db28..c8a450b0d 100644
--- a/src/libffmpeg/ffmpeg_encoder.c
+++ b/src/libffmpeg/ffmpeg_encoder.c
@@ -74,7 +74,7 @@ int dxr3_encoder_init(dxr3_driver_t *drv)
lavc_data_t* this;
avcodec_init();
- register_avcodec(&mpeg1video_encoder);
+ avcodec_register_all();
lprintf("lavc init , version %x\n", avcodec_version());
this = xine_xmalloc(sizeof(lavc_data_t));
if (!this) return 0;