diff options
28 files changed, 42 insertions, 41 deletions
diff --git a/contrib/a52dec/Makefile.am b/contrib/a52dec/Makefile.am index 6eebd58be..6da10ec84 100644 --- a/contrib/a52dec/Makefile.am +++ b/contrib/a52dec/Makefile.am @@ -8,5 +8,5 @@ endif liba52_la_SOURCES = bitstream.c bit_allocate.c downmix.c imdct.c parse.c \ a52.h a52_internal.h bitstream.h tables.h crc.c -liba52_la_LIBADD = -lm -liba52_la_CPPFLAGS = $(AM_CPPFLAGS) +liba52_la_LIBADD = -lm $(AVUTIL_LIBS) +liba52_la_CPPFLAGS = $(AM_CPPFLAGS) $(AVUTIL_CFLAGS) diff --git a/contrib/a52dec/parse.c b/contrib/a52dec/parse.c index 7aba1d809..82e29121b 100644 --- a/contrib/a52dec/parse.c +++ b/contrib/a52dec/parse.c @@ -32,6 +32,7 @@ #include "bitstream.h" #include "tables.h" #include <xine/xineutils.h> +#include <mem.h> typedef struct { sample_t q1[2]; @@ -53,15 +54,13 @@ a52_state_t * a52_init (uint32_t mm_accel) if (state == NULL) return NULL; - state->samples = xine_xmalloc_aligned (16, 256 * 12 * sizeof (sample_t), &state->samples_base); + state->samples_base = state->samples = av_mallocz (256 * 12 * sizeof (sample_t)); + if (state->samples == NULL) { free (state); return NULL; } - for (i = 0; i < 256 * 12; i++) - state->samples[i] = 0; - state->downmixed = 1; state->lfsr_state = 1; diff --git a/src/audio_dec/ff_dvdata.h b/src/audio_dec/ff_dvdata.h index 5e6d3d485..fc99349d0 100644 --- a/src/audio_dec/ff_dvdata.h +++ b/src/audio_dec/ff_dvdata.h @@ -27,8 +27,8 @@ #ifndef FFMPEG_DVDATA_H #define FFMPEG_DVDATA_H -#include <libavcodec/avcodec.h> -#include <libavutil/rational.h> +#include <avcodec.h> +#include <rational.h> /* * DVprofile is used to express the differences between various diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c index 69c07df46..8d0c35f91 100644 --- a/src/audio_dec/xine_a52_decoder.c +++ b/src/audio_dec/xine_a52_decoder.c @@ -62,7 +62,7 @@ #include <xine/buffer.h> #include <xine/xineutils.h> -#include <libavutil/crc.h> +#include <crc.h> #undef DEBUG_A52 #ifdef DEBUG_A52 diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index a285d02d8..7f7f71b97 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -31,7 +31,7 @@ #include <unistd.h> #include <string.h> -#include <libavutil/mem.h> +#include <mem.h> #define LOG_MODULE "demux_mpeg_block" #define LOG_VERBOSE diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 9a0b88c6f..21701f141 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -35,7 +35,7 @@ #include <unistd.h> #include <string.h> -#include <libavutil/mem.h> +#include <mem.h> #define LOG_MODULE "demux_mpeg_pes" #define LOG_VERBOSE diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 748170fd4..1bc33b44c 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -141,7 +141,7 @@ #include <unistd.h> #include <string.h> -#include <libavutil/crc.h> +#include <crc.h> #define LOG_MODULE "demux_ts" #define LOG_VERBOSE 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 diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index bf958b839..cc873bb16 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -58,8 +58,8 @@ #include <basedir.h> -#include <libavutil/base64.h> -#include <libavutil/sha1.h> +#include <base64.h> +#include <sha1.h> #define LOG_MODULE "input_cdda" #define LOG_VERBOSE diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index 677085c65..425f90fd9 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -100,7 +100,7 @@ #endif #include <ctype.h> -#include <libavutil/crc.h> +#include <crc.h> /* XDG */ #include <basedir.h> diff --git a/src/input/input_http.c b/src/input/input_http.c index a9bca910b..dd9798bb1 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -40,7 +40,7 @@ #include <sys/time.h> -#include <libavutil/base64.h> +#include <base64.h> #define LOG_MODULE "input_http" #define LOG_VERBOSE diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c index 4ef8f5f03..7920bdc40 100644 --- a/src/input/libreal/sdpplin.c +++ b/src/input/libreal/sdpplin.c @@ -31,7 +31,7 @@ #include "sdpplin.h" #include <xine/xineutils.h> -#include <libavutil/base64.h> +#include <base64.h> static char *nl(char *data) { diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index 29d79fb14..e7a7c3d32 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -27,7 +27,7 @@ #include <math.h> #include <pthread.h> -#include <libavutil/mem.h> +#include <mem.h> #ifdef ARCH_X86_64 # define REG_a "rax" diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index dc455a858..c39db87cd 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -25,7 +25,7 @@ #include <xine/xine_internal.h> #include <xine/post.h> #include <xine/xineutils.h> -#include <libpostproc/postprocess.h> +#include <postprocess.h> #include <pthread.h> #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ diff --git a/src/video_dec/libmpeg2/decode.c b/src/video_dec/libmpeg2/decode.c index e9700d95f..a9db54847 100644 --- a/src/video_dec/libmpeg2/decode.c +++ b/src/video_dec/libmpeg2/decode.c @@ -37,7 +37,7 @@ #define LOG */ -#include <libavutil/mem.h> +#include <mem.h> #include <xine/xine_internal.h> #include <xine/video_out.h> diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index dd2a97c28..3429e883f 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -35,7 +35,7 @@ #include <sys/mman.h> #include <sys/time.h> -#include <libavutil/mem.h> +#include <mem.h> #include <aalib.h> diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index e9d5a7d85..01aad0bc8 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -37,7 +37,7 @@ #include <cucul.h> #include <caca.h> -#include <libavutil/mem.h> +#include <mem.h> #include "xine.h" #include <xine/video_out.h> diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index d38a39917..1efc39459 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -68,7 +68,7 @@ #include <pthread.h> #include <netinet/in.h> -#include <libavutil/mem.h> +#include <mem.h> #include <linux/fb.h> #include <linux/kd.h> diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 2f3faed13..533b26a22 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -47,7 +47,7 @@ #include <ctype.h> #include <pthread.h> -#include <libavutil/mem.h> +#include <mem.h> /* defines for debugging extensions only */ /* #define GL_GLEXT_LEGACY */ diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 6a6051658..1b2e90be8 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -50,7 +50,7 @@ #include <pthread.h> #include <netinet/in.h> -#include <libavutil/mem.h> +#include <mem.h> #define LOG_MODULE "video_out_xcbshm" #define LOG_VERBOSE diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index e1fb1f339..fba253b87 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -51,7 +51,7 @@ #include <pthread.h> #include <netinet/in.h> -#include <libavutil/mem.h> +#include <mem.h> #define LOG_MODULE "video_out_xshm" #define LOG_VERBOSE diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c index 2ea882095..127338ee5 100644 --- a/src/video_out/yuv2rgb.c +++ b/src/video_out/yuv2rgb.c @@ -31,7 +31,7 @@ #include <string.h> #include <inttypes.h> -#include <libavutil/mem.h> +#include <mem.h> #include "yuv2rgb.h" diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c index 2a7c73cdf..52a683d30 100644 --- a/src/video_out/yuv2rgb_mmx.c +++ b/src/video_out/yuv2rgb_mmx.c @@ -31,7 +31,7 @@ #include <string.h> #include <inttypes.h> -#include <libavutil/mem.h> +#include <mem.h> #include "yuv2rgb.h" #include <xine/xineutils.h> diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index 605fbaa09..6b6d48a11 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.c @@ -36,7 +36,7 @@ #include <stdlib.h> #include <assert.h> -#include <libavutil/mem.h> +#include <mem.h> /********** logging **********/ #define LOG_MODULE "buffer" diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 9f67b7503..c3b698be7 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -33,7 +33,7 @@ #include <unistd.h> #include <xine/configfile.h> #include "bswap.h" -#include <libavutil/base64.h> +#include <base64.h> #define LOG_MODULE "configfile" #define LOG_VERBOSE |