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 | |
| 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')
| -rw-r--r-- | src/dxr3/Makefile.am | 2 | ||||
| -rw-r--r-- | src/dxr3/dxr3_mpeg_encoders.c | 2 | ||||
| -rw-r--r-- | src/dxr3/ffmpeg_encoder.c | 18 | ||||
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index ff4f69cbc..f8e88974b 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -45,4 +45,4 @@ xineplug_vo_out_dxr3_la_SOURCES = \ video_out_dxr3.c xineplug_vo_out_dxr3_la_CFLAGS = $(AM_CFLAGS) $(AVUTIL_CFLAGS) $(FFMPEG_CFLAGS) -xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(AVUTIL_LIBS) $(FFMPEG_LDFLAGS) -lm +xineplug_vo_out_dxr3_la_LIBADD = $(XINE_LIB) $(link_fame) $(link_rte) $(link_x_libs) $(LTLIBINTL) $(AVUTIL_LIBS) $(FFMPEG_LIBS) -lm diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index f637a4566..cd9180eb6 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.c @@ -44,7 +44,7 @@ #include <math.h> #include <unistd.h> -#include <libavutil/mem.h> +#include <mem.h> #define LOG_MODULE "dxr3_mpeg_encoder" /* #define LOG_VERBOSE */ 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); diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 20cee345b..70937cfd0 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -66,6 +66,8 @@ #include "dxr3.h" #include "video_out_dxr3.h" +#include <mem.h> + /* the amount of extra time we give the card for decoding */ #define DECODE_PIPE_PREBUFFER 10000 |