[packages/mplayer] - more type fixes, release 9
qboosh
qboosh at pld-linux.org
Fri Aug 15 06:38:14 CEST 2025
commit 10ed19b7d77743cb5ddf944ad4d081e59aeb68d7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Aug 15 06:40:36 2025 +0200
- more type fixes, release 9
mplayer-types.patch | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++
mplayer.spec | 2 +-
2 files changed, 178 insertions(+), 1 deletion(-)
---
diff --git a/mplayer.spec b/mplayer.spec
index d72eb28..7179fe1 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -124,7 +124,7 @@ Summary(pl.UTF-8): Odtwarzacz filmów dla systemów uniksowych
Summary(pt_BR.UTF-8): Reprodutor de filmes
Name: mplayer
Version: 1.5
-Release: 8
+Release: 9
# DO NOT increase epoch unless it's really neccessary!
# especially such changes like pre7->pre7try2, increase Release instead!
# PS: $ rpmvercmp pre7try2 pre7
diff --git a/mplayer-types.patch b/mplayer-types.patch
index 500e549..d4e6c8f 100644
--- a/mplayer-types.patch
+++ b/mplayer-types.patch
@@ -206,3 +206,180 @@
vf->dmpi->planes,vf->dmpi->stride,
(mpi->w+7)&(~7),mpi->h,
mpi->qscale, mpi->qstride,
+--- MPlayer-1.5/libmpcodecs/ve_raw.c.orig 2016-02-20 12:32:40.000000000 +0100
++++ MPlayer-1.5/libmpcodecs/ve_raw.c 2025-08-14 21:40:15.189379358 +0200
+@@ -150,7 +150,7 @@ static int query_format(struct vf_instan
+ return 0;
+ }
+
+-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) {
++static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double) {
+ mux_v->buffer = mpi->planes[0];
+ muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10, pts, pts);
+ return 1;
+--- MPlayer-1.5/libmpdemux/muxer_avi.c.orig 2018-01-06 01:54:40.000000000 +0100
++++ MPlayer-1.5/libmpdemux/muxer_avi.c 2025-08-14 21:55:45.551513762 +0200
+@@ -142,8 +142,8 @@ static muxer_stream_t* avifile_new_strea
+ static void write_avi_chunk(stream_t *stream,unsigned int id,int len,void* data){
+ int le_len = le2me_32(len);
+ int le_id = le2me_32(id);
+- stream_write_buffer(stream, &le_id, 4);
+- stream_write_buffer(stream, &le_len, 4);
++ stream_write_buffer(stream, (void*)&le_id, 4);
++ stream_write_buffer(stream, (void*)&le_len, 4);
+
+ if(len>0){
+ if(data){
+@@ -176,9 +176,9 @@ static void write_avi_list(stream_t *str
+ list_id = le2me_32(list_id);
+ le_len = le2me_32(len);
+ le_id = le2me_32(id);
+- stream_write_buffer(stream, &list_id, 4);
+- stream_write_buffer(stream, &le_len, 4);
+- stream_write_buffer(stream, &le_id, 4);
++ stream_write_buffer(stream, (void*)&list_id, 4);
++ stream_write_buffer(stream, (void*)&le_len, 4);
++ stream_write_buffer(stream, (void*)&le_id, 4);
+ }
+
+ static void avifile_odml_new_riff(muxer_t *muxer)
+@@ -199,7 +199,7 @@ static void avifile_odml_new_riff(muxer_
+ riff[0]=le2me_32(mmioFOURCC('R','I','F','F'));
+ riff[1]=0;
+ riff[2]=le2me_32(mmioFOURCC('A','V','I','X'));
+- stream_write_buffer(muxer->stream, riff, 12);
++ stream_write_buffer(muxer->stream, (void*)riff, 12);
+
+ write_avi_list(muxer->stream,listtypeAVIMOVIE,0);
+
+@@ -251,12 +251,12 @@ static void avifile_write_header(muxer_t
+ movilen = le2me_32(rifflen - 12);
+ rifflen = le2me_32(rifflen);
+ stream_seek(muxer->stream, vsi->riffofs[i]+4);
+- stream_write_buffer(muxer->stream,&rifflen,4);
++ stream_write_buffer(muxer->stream,(void*)&rifflen,4);
+
+ /* fixup movi length */
+ if (i > 0) {
+ stream_seek(muxer->stream, vsi->riffofs[i]+16);
+- stream_write_buffer(muxer->stream,&movilen,4);
++ stream_write_buffer(muxer->stream,(void*)&movilen,4);
+ }
+ }
+
+@@ -269,7 +269,7 @@ static void avifile_write_header(muxer_t
+ riff[0]=le2me_32(riff[0]);
+ riff[1]=le2me_32(riff[1]);
+ riff[2]=le2me_32(riff[2]);
+- stream_write_buffer(muxer->stream,&riff,12);
++ stream_write_buffer(muxer->stream,(void*)&riff,12);
+ }
+
+ // update AVI header:
+@@ -406,7 +406,7 @@ static void avifile_write_header(muxer_t
+ idxhdr[6] = 0;
+ idxhdr[7] = 0;
+
+- stream_write_buffer(muxer->stream,idxhdr,sizeof(idxhdr));
++ stream_write_buffer(muxer->stream,(void*)idxhdr,sizeof(idxhdr));
+ for (j=0; j<n; j++) {
+ struct avi_odmlsuperidx_entry *entry = &si->superidx[j];
+ unsigned int data[4];
+@@ -414,7 +414,7 @@ static void avifile_write_header(muxer_t
+ data[1] = le2me_32(entry->ofs >> 32);
+ data[2] = le2me_32(entry->len);
+ data[3] = le2me_32(entry->duration);
+- stream_write_buffer(muxer->stream,data,sizeof(data));
++ stream_write_buffer(muxer->stream,(void*)data,sizeof(data));
+ }
+ }
+ }
+@@ -642,13 +642,13 @@ static void avifile_odml_write_index(mux
+ si->superidx[j].ofs = stream_tell(muxer->stream);
+ si->superidx[j].duration = duration;
+
+- stream_write_buffer(muxer->stream, idxhdr,sizeof(idxhdr));
++ stream_write_buffer(muxer->stream, (void*)idxhdr,sizeof(idxhdr));
+ for (k=0; k<entries_per_subidx && idxpos<si->idxpos; k++) {
+ unsigned int entry[2];
+ entry[0] = le2me_32(si->idx[idxpos].ofs - start);
+ entry[1] = le2me_32(si->idx[idxpos].len | si->idx[idxpos].flags);
+ idxpos++;
+- stream_write_buffer(muxer->stream, entry, sizeof(entry));
++ stream_write_buffer(muxer->stream, (void*)entry, sizeof(entry));
+ }
+ }
+ }
+--- MPlayer-1.5/libmpcodecs/ve_lavc.c.orig 2021-05-14 21:56:16.000000000 +0200
++++ MPlayer-1.5/libmpcodecs/ve_lavc.c 2025-08-14 21:58:16.152399227 +0200
+@@ -441,7 +441,7 @@ static int config(struct vf_instance *vf
+ mp_msg(MSGT_MENCODER,MSGL_ERR,"error parsing vrc_q\n");
+ return 0;
+ }
+- lavc_venc_context->rc_override=
++ lavc_venc_context->rc_override=(void*)
+ av_reallocp_array(lavc_venc_context->rc_override, i+1, sizeof(*lavc_venc_context->rc_override));
+ lavc_venc_context->rc_override[i].start_frame= start;
+ lavc_venc_context->rc_override[i].end_frame = end;
+@@ -710,7 +710,7 @@ static double psnr(double d){
+ return -10.0*log(d)/log(10);
+ }
+
+-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
++static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double){
+ AVFrame *pic= vf->priv->pic;
+
+ pic->data[0]=mpi->planes[0];
+--- MPlayer-1.5/libmpcodecs/ve_libdv.c.orig 2010-09-12 18:08:57.000000000 +0200
++++ MPlayer-1.5/libmpcodecs/ve_libdv.c 2025-08-14 21:58:42.945890093 +0200
+@@ -88,7 +88,7 @@ static int query_format(struct vf_instan
+ return 0;
+ }
+
+-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
++static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double){
+
+ dv_encode_full_frame(vf->priv->enc, mpi->planes,
+ (mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,
+--- MPlayer-1.5/libmpcodecs/ve_nuv.c.orig 2010-11-14 10:12:34.000000000 +0100
++++ MPlayer-1.5/libmpcodecs/ve_nuv.c 2025-08-14 21:58:59.405986871 +0200
+@@ -120,7 +120,7 @@ static int query_format(struct vf_instan
+ return 0;
+ }
+
+-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
++static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double){
+ uint8_t *header = vf->priv->buffer;
+ uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE;
+ uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE;
+--- MPlayer-1.5/libmpcodecs/ve_x264.c.orig 2021-01-23 19:22:09.000000000 +0100
++++ MPlayer-1.5/libmpcodecs/ve_x264.c 2025-08-14 21:59:20.506110931 +0200
+@@ -62,7 +62,7 @@ typedef struct h264_module_t {
+ static x264_param_t param;
+ static int parse_error = 0;
+
+-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts);
++static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double);
+ static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in);
+
+ void x264enc_set_param(const m_option_t* opt, char* arg)
+@@ -234,7 +234,7 @@ static int query_format(struct vf_instan
+ return 0;
+ }
+
+-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
++static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double)
+ {
+ h264_module_t *mod=(h264_module_t*)vf->priv;
+ int i;
+--- MPlayer-1.5/libmpcodecs/ve_xvid4.c.orig 2021-01-23 19:22:09.000000000 +0100
++++ MPlayer-1.5/libmpcodecs/ve_xvid4.c 2025-08-15 06:23:10.998215058 +0200
+@@ -523,7 +523,7 @@ query_format(struct vf_instance *vf, uns
+ *==========================================================================*/
+
+ static int
+-put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
++put_image(struct vf_instance *vf, mp_image_t *mpi, double pts, double)
+ {
+ int size;
+ xvid_enc_stats_t stats;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mplayer.git/commitdiff/10ed19b7d77743cb5ddf944ad4d081e59aeb68d7
More information about the pld-cvs-commit
mailing list