From: <li...@yo...> - 2007-12-07 00:39:27
|
# HG changeset patch # User Darren Salt <li...@yo...> # Date 1196987921 0 # Node ID e55bc398cc7cc1e447985a4ad569581c511325ce # Parent aba4d90445d821d9a32ee2fe8b1300d08999ab36 Fix compilation of DXR3 support with external ffmpeg. Untested with actual DXR3. Compilation was "broken" by ffmpeg rev. 9283. diff -r e55bc398cc7cc1e447985a4ad569581c511325ce -r aba4d90445d821d9a32ee2fe8b1300d08999ab36 ChangeLog --- a/ChangeLog Fri Dec 07 00:38:41 2007 +0000 +++ b/ChangeLog Tue Dec 04 00:43:27 2007 +0100 @@ -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 -r e55bc398cc7cc1e447985a4ad569581c511325ce -r aba4d90445d821d9a32ee2fe8b1300d08999ab36 src/libffmpeg/ffmpeg_encoder.c --- a/src/libffmpeg/ffmpeg_encoder.c Fri Dec 07 00:38:41 2007 +0000 +++ b/src/libffmpeg/ffmpeg_encoder.c Tue Dec 04 00:43:27 2007 +0100 @@ -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; |