diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-09 19:10:58 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-09 19:10:58 +0100 |
| commit | 8063ffb8c0b354d54834ba53b22003dac481de2c (patch) | |
| tree | 2663524c8c6376ab1ee7dd2a620b0979fc80ddb3 /src/dxr3/ffmpeg_encoder.c | |
| parent | 39939c95eff90545285a9a8f761d9fa6e9349358 (diff) | |
| download | xine-lib-8063ffb8c0b354d54834ba53b22003dac481de2c.tar.gz xine-lib-8063ffb8c0b354d54834ba53b22003dac481de2c.tar.bz2 | |
Compilation fixes, mostly ffmpeg-related, and linkage fixes.
Tests done on amd64 with ffmpeg 0.svn20080206 from Debian experimental.
libavcodec 51.50.0, libavutil 49.6.0, libpostproc 51.1.0
Diffstat (limited to 'src/dxr3/ffmpeg_encoder.c')
| -rw-r--r-- | src/dxr3/ffmpeg_encoder.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c index d9ee921cc..06eee8c17 100644 --- a/src/dxr3/ffmpeg_encoder.c +++ b/src/dxr3/ffmpeg_encoder.c @@ -62,7 +62,15 @@ typedef struct lavc_data_s { } lavc_data_t; -int dxr3_lavc_init(dxr3_driver_t *drv) +static int dxr3_lavc_close(dxr3_driver_t *drv) { + drv->enc->on_unneeded(drv); + free(drv->enc); + drv->enc = NULL; + + return 1; +} + +int dxr3_lavc_init(dxr3_driver_t *drv, plugin_node_t *plugin) { lavc_data_t* this; avcodec_init(); @@ -84,14 +92,6 @@ int dxr3_lavc_init(dxr3_driver_t *drv) return 1; } -static int dxr3_lavc_close(dxr3_driver_t *drv) { - drv->enc->on_unneeded(drv); - free(drv->enc); - drv->enc = NULL; - - return 1; -} - /* helper function */ static int lavc_prepare_frame(lavc_data_t *this, dxr3_driver_t *drv, dxr3_frame_t *frame); |