diff --git a/package/base/mplayer/ivtv-hotfix.patch b/package/base/mplayer/ivtv-hotfix.patch new file mode 100644 index 000000000..89b59847b --- /dev/null +++ b/package/base/mplayer/ivtv-hotfix.patch @@ -0,0 +1,43 @@ + +See http://www.mail-archive.com/ivtv-users@ivtvdriver.org/msg07585.html + +--- ./libvo/vo_ivtv.c.orig 2009-03-25 09:16:35.000000000 +0100 ++++ ./libvo/vo_ivtv.c 2009-03-25 09:17:08.000000000 +0100 +@@ -36,8 +36,8 @@ + #include + #include + #include +-#include + #include ++#include + + #include "mp_msg.h" + #include "subopt-helper.h" +@@ -76,25 +76,14 @@ + static uint32_t + ivtv_reset (int blank_screen) + { +- struct ivtv_cfg_stop_decode sd; +- struct ivtv_cfg_start_decode sd1; +- int flags = 0; +- +- if (blank_screen) +- flags |= IVTV_STOP_FL_HIDE_FRAME; +- sd.flags = flags; +- +- if (ioctl (ivtv_fd, IVTV_IOC_STOP_DECODE, &sd) < 0) ++ if (ioctl (ivtv_fd, VIDEO_STOP, 0) < 0) + { + mp_msg (MSGT_VO, MSGL_ERR, + "IVTV_IOC_STOP_DECODE: %s\n", strerror (errno)); + return 1; + } + +- sd1.gop_offset = 0; +- sd1.muted_audio_frames = 0; +- +- if (ioctl (ivtv_fd, IVTV_IOC_START_DECODE, &sd1) < 0) ++ if (ioctl (ivtv_fd, VIDEO_PLAY, 0) < 0) + { + mp_msg (MSGT_VO, MSGL_ERR, + "IVTV_IOC_START_DECODE: %s\n", strerror (errno)); diff --git a/package/base/mplayer/libx264-hotfix.patch b/package/base/mplayer/libx264-hotfix.patch new file mode 100644 index 000000000..eaa7f469e --- /dev/null +++ b/package/base/mplayer/libx264-hotfix.patch @@ -0,0 +1,32 @@ + +See http://www.nabble.com/-MacPorts---18551:-MPlayer-1.0rc2_3-fails-to-build-with-%2Bx264-td22110540.html + +--- ./libavcodec/libx264.c.orig 2009-03-25 09:53:39.000000000 +0100 ++++ ./libavcodec/libx264.c 2009-03-25 09:54:53.000000000 +0100 +@@ -124,6 +124,8 @@ + { + X264Context *x4 = avctx->priv_data; + ++ av_freep(&avctx->extradata); ++ + if(x4->enc) + x264_encoder_close(x4->enc); + +@@ -162,7 +164,7 @@ + + x4->params.i_bframe = avctx->max_b_frames; + x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; +- x4->params.b_bframe_adaptive = avctx->b_frame_strategy; ++ x4->params.i_bframe_adaptive = avctx->b_frame_strategy; + x4->params.i_bframe_bias = avctx->bframebias; + x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID); + avctx->has_b_frames= (avctx->flags2 & CODEC_FLAG2_BPYRAMID) ? 2 : !!avctx->max_b_frames; +@@ -225,8 +227,6 @@ + x4->params.analyse.i_me_range = avctx->me_range; + x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; + +- x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0); +- x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO); + x4->params.analyse.b_mixed_references = + (avctx->flags2 & CODEC_FLAG2_MIXED_REFS); + x4->params.analyse.b_chroma_me = (avctx->me_cmp & FF_CMP_CHROMA);