diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_hwac3.c | 1 | ||||
-rw-r--r-- | libmpcodecs/ad_liba52.c | 1 | ||||
-rw-r--r-- | libmpcodecs/native/nuppelvideo.c | 8 | ||||
-rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 12 | ||||
-rw-r--r-- | libmpcodecs/vd_lzo.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ve_lavc.c | 5 |
6 files changed, 19 insertions, 12 deletions
diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 95f072212c..2fc6848d53 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -5,6 +5,7 @@ (see http://www.dtek.chalmers.se/~dvd/) */ +#define _XOPEN_SOURCE #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index a78d4cc2dd..afff444d8f 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -1,3 +1,4 @@ +#define _XOPEN_SOURCE #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index ff3e1f83fa..8128f85c47 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -56,7 +56,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, int in_len = encodedh->packetlength; #ifdef KEEP_BUFFER if (!previous_buffer) - previous_buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING ); + previous_buffer = ( unsigned char * ) malloc ( out_len + AV_LZO_OUTPUT_PADDING ); #endif switch(encodedh->comptype) @@ -69,13 +69,13 @@ void decode_nuv( unsigned char *encoded, int encoded_size, break; case '2': /* RTJpeg with LZO */ if (!buffer) - buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING ); + buffer = ( unsigned char * ) malloc ( out_len + AV_LZO_OUTPUT_PADDING ); if (!buffer) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); break; } - r = lzo1x_decode ( buffer, &out_len, encoded + 12, &in_len ); + r = av_lzo1x_decode ( buffer, &out_len, encoded + 12, &in_len ); if ( r ) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); @@ -84,7 +84,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded ); break; case '3': /* raw YUV420 with LZO */ - r = lzo1x_decode ( decoded, &out_len, encoded + 12, &in_len ); + r = av_lzo1x_decode ( decoded, &out_len, encoded + 12, &in_len ); if ( r ) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 0e8fd81f97..82839ec942 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -27,7 +27,7 @@ LIBVD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" -#ifdef CONFIG_XVMC +#if CONFIG_XVMC #include "xvmc_render.h" #endif @@ -61,7 +61,7 @@ typedef struct { static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -#ifdef CONFIG_XVMC +#if CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * pix_fmt); static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic); @@ -125,7 +125,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride break; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC case IMGFMT_XVMC_IDCT_MPEG2: case IMGFMT_XVMC_MOCO_MPEG2: if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; @@ -233,7 +233,7 @@ static int init(sh_video_t *sh){ ctx->avctx = avcodec_alloc_context(); avctx = ctx->avctx; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC #ifdef CODEC_CAP_HWACCEL if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ @@ -517,7 +517,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram -#ifdef CONFIG_XVMC +#if CONFIG_XVMC case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break; case PIX_FMT_XVMC_MPEG2_IDCT:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break; #endif @@ -895,7 +895,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } -#ifdef CONFIG_XVMC +#if CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * fmt){ sh_video_t * sh = avctx->opaque; diff --git a/libmpcodecs/vd_lzo.c b/libmpcodecs/vd_lzo.c index a49a418e26..a60436cbe5 100644 --- a/libmpcodecs/vd_lzo.c +++ b/libmpcodecs/vd_lzo.c @@ -55,7 +55,7 @@ static int init(sh_video_t *sh) return 0; } priv->bufsz = sh->bih->biSizeImage; - priv->buffer = malloc(priv->bufsz + LZO_OUTPUT_PADDING); + priv->buffer = malloc(priv->bufsz + AV_LZO_OUTPUT_PADDING); priv->codec = -1; sh->context = priv; @@ -88,7 +88,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) return NULL; // skipped frame } - r = lzo1x_decode(priv->buffer, &w, data, &len); + r = av_lzo1x_decode(priv->buffer, &w, data, &len); if (r) { /* this should NEVER happen */ mp_msg (MSGT_DECVIDEO, MSGL_ERR, diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 8ab4cc43d3..606de43a87 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -113,6 +113,7 @@ static int lavc_param_bit_exact = 0; static int lavc_param_aic= 0; static int lavc_param_aiv= 0; static int lavc_param_umv= 0; +static int lavc_param_gmc= 0; static int lavc_param_obmc= 0; static int lavc_param_loop= 0; static int lavc_param_last_pred= 0; @@ -283,6 +284,9 @@ m_option_t lavcopts_conf[]={ #ifdef CODEC_FLAG_CLOSED_GOP {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP, NULL}, #endif +#ifdef CODEC_FLAG_GMC + {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL}, +#endif {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL}, {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, {"inter_threshold", &lavc_param_inter_threshold, CONF_TYPE_INT, CONF_RANGE, -1000000, 1000000, NULL}, @@ -555,6 +559,7 @@ static int config(struct vf_instance* vf, lavc_venc_context->flags|= lavc_param_ss; lavc_venc_context->flags|= lavc_param_alt; lavc_venc_context->flags|= lavc_param_ilme; + lavc_venc_context->flags|= lavc_param_gmc; #ifdef CODEC_FLAG_CLOSED_GOP lavc_venc_context->flags|= lavc_param_closed_gop; #endif |