[MPlayer-cvslog] r38400 - in trunk/libmpcodecs: ve_lavc.c ve_libdv.c ve_nuv.c ve_qtvideo.c ve_raw.c ve_vfw.c ve_x264.c ve_xvid4.c

[reimar]

Author: reimar
Date: Tue Aug 30 23:40:03 2022
New Revision: 38400

Log:
libmpcodecs/ve_*.c: fix put_image prototypes.

An extra endpts argument was added, and while none
of the encoders uses that currently, the functions
should have the proper types.

Modified:
   trunk/libmpcodecs/ve_lavc.c
   trunk/libmpcodecs/ve_libdv.c
   trunk/libmpcodecs/ve_nuv.c
   trunk/libmpcodecs/ve_qtvideo.c
   trunk/libmpcodecs/ve_raw.c
   trunk/libmpcodecs/ve_vfw.c
   trunk/libmpcodecs/ve_x264.c
   trunk/libmpcodecs/ve_xvid4.c

Modified: trunk/libmpcodecs/ve_lavc.c
==============================================================================
--- trunk/libmpcodecs/ve_lavc.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_lavc.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -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 endpts){
     AVFrame *pic= vf->priv->pic;
 
     pic->data[0]=mpi->planes[0];

Modified: trunk/libmpcodecs/ve_libdv.c
==============================================================================
--- trunk/libmpcodecs/ve_libdv.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_libdv.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -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 endpts){
 
     dv_encode_full_frame(vf->priv->enc, mpi->planes,
 	(mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb,

Modified: trunk/libmpcodecs/ve_nuv.c
==============================================================================
--- trunk/libmpcodecs/ve_nuv.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_nuv.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -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 endpts){
   uint8_t *header  = vf->priv->buffer;
   uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE;
   uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE;

Modified: trunk/libmpcodecs/ve_qtvideo.c
==============================================================================
--- trunk/libmpcodecs/ve_qtvideo.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_qtvideo.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -188,7 +188,7 @@ static int query_format(struct vf_instan
 
 static int codec_initialized = 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 endpts){
 
     OSErr cres;
     long framesizemax;

Modified: trunk/libmpcodecs/ve_raw.c
==============================================================================
--- trunk/libmpcodecs/ve_raw.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_raw.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -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 endpts) {
     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;

Modified: trunk/libmpcodecs/ve_vfw.c
==============================================================================
--- trunk/libmpcodecs/ve_vfw.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_vfw.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -303,7 +303,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 endpts){
     long flags=0;
     int ret;
 //    flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack

Modified: trunk/libmpcodecs/ve_x264.c
==============================================================================
--- trunk/libmpcodecs/ve_x264.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_x264.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -62,7 +62,6 @@ 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 encode_frame(struct vf_instance *vf, x264_picture_t *pic_in);
 
 void x264enc_set_param(const m_option_t* opt, char* arg)
@@ -234,7 +233,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 endpts)
 {
     h264_module_t *mod=(h264_module_t*)vf->priv;
     int i;

Modified: trunk/libmpcodecs/ve_xvid4.c
==============================================================================
--- trunk/libmpcodecs/ve_xvid4.c	Tue Aug 30 23:26:51 2022	(r38399)
+++ trunk/libmpcodecs/ve_xvid4.c	Tue Aug 30 23:40:03 2022	(r38400)
@@ -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 endpts)
 {
 	int size;
 	xvid_enc_stats_t stats;