diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-19 01:48:52 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-19 01:48:52 +0000 |
commit | 489b07338c1f3dd6110440672a4f8616b6520d4c (patch) | |
tree | 9f06b6dd38e40dcb0bd8fee4dd85b5fd7a5675cc /libmpcodecs | |
parent | a52ed04fcbdabd038c12059a80e1b9547b9fb4d4 (diff) | |
download | mpv-489b07338c1f3dd6110440672a4f8616b6520d4c.tar.bz2 mpv-489b07338c1f3dd6110440672a4f8616b6520d4c.tar.xz |
Cleanup of the muxer API, func parameters muxer & muxer_f eliminated.
patch by Andriy N. Gritsenko <andrej@lucky.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9015 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ve_divx4.c | 3 | ||||
-rw-r--r-- | libmpcodecs/ve_lavc.c | 3 | ||||
-rw-r--r-- | libmpcodecs/ve_libdv.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ve_qtvideo.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ve_rawrgb.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ve_vfw.c | 4 | ||||
-rw-r--r-- | libmpcodecs/ve_xvid.c | 3 |
7 files changed, 7 insertions, 18 deletions
diff --git a/libmpcodecs/ve_divx4.c b/libmpcodecs/ve_divx4.c index 5ef26068cb..aeb9198667 100644 --- a/libmpcodecs/ve_divx4.c +++ b/libmpcodecs/ve_divx4.c @@ -44,7 +44,6 @@ static int pass; extern char* passtmpfile; -extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); #include <encore2.h> @@ -273,7 +272,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ enc_result.quantizer); } } - mencoder_write_chunk(mux_v,vf->priv->enc_frame.length,enc_result.is_key_frame?0x10:0); + muxer_write_chunk(mux_v,vf->priv->enc_frame.length,enc_result.is_key_frame?0x10:0); return 1; } diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 991b1267bc..952f882a46 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -27,7 +27,6 @@ #include "vf.h" extern char* passtmpfile; -extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); //===========================================================================// @@ -486,7 +485,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ out_size = avcodec_encode_video(lavc_venc_context, mux_v->buffer, mux_v->buffer_size, pic); - mencoder_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0); + muxer_write_chunk(mux_v,out_size,lavc_venc_context->coded_frame->key_frame?0x10:0); #if LIBAVCODEC_BUILD >= 4643 /* store psnr / pict size / type / qscale */ diff --git a/libmpcodecs/ve_libdv.c b/libmpcodecs/ve_libdv.c index 511c059556..81f62a3dc2 100644 --- a/libmpcodecs/ve_libdv.c +++ b/libmpcodecs/ve_libdv.c @@ -23,8 +23,6 @@ #include <libdv/dv.h> -extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); - #ifndef DV_WIDTH #define DV_WIDTH 720 #define DV_PAL_HEIGHT 576 @@ -78,7 +76,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ (mpi->flags&MP_IMGFLAG_YUV) ? e_dv_color_yuv : e_dv_color_rgb, mux_v->buffer); - mencoder_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10); + muxer_write_chunk(mux_v, 480 * (vf->priv->enc->isPAL ? 300 : 250) , 0x10); return 1; } diff --git a/libmpcodecs/ve_qtvideo.c b/libmpcodecs/ve_qtvideo.c index af10217d0d..755c90a0c8 100644 --- a/libmpcodecs/ve_qtvideo.c +++ b/libmpcodecs/ve_qtvideo.c @@ -90,8 +90,6 @@ static long (*CountComponents)(ComponentDescription* desc); static OSErr (*GetComponentInfo)(Component prev,ComponentDescription* desc,Handle h1,Handle h2,Handle h3); -extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); - //static int format=mmioFOURCC('S','V','Q','1'); static int format=mmioFOURCC('S','V','Q','3'); @@ -260,7 +258,7 @@ if(!codec_inited){ printf("Size %i->%i \n",stride*height,compressedsize); printf("Ratio: %i:1\n",(stride*height)/compressedsize); #endif - mencoder_write_chunk(mux_v, compressedsize , similarity?0:0x10); + muxer_write_chunk(mux_v, compressedsize , similarity?0:0x10); if(((*desc)->idSize)>MAX_IDSIZE){ printf("FATAL! idSize=%d too big, increase MAX_IDSIZE in ve_qtvideo.c!\n",((*desc)->idSize)); diff --git a/libmpcodecs/ve_rawrgb.c b/libmpcodecs/ve_rawrgb.c index 2388db5f28..64e03b30f8 100644 --- a/libmpcodecs/ve_rawrgb.c +++ b/libmpcodecs/ve_rawrgb.c @@ -16,8 +16,6 @@ #include "mp_image.h" #include "vf.h" -extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); - //===========================================================================// struct vf_priv_s { @@ -48,7 +46,7 @@ static int query_format(struct vf_instance_s* vf, unsigned int fmt){ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ mux_v->buffer=mpi->planes[0]; - mencoder_write_chunk(mux_v, mpi->width*mpi->height*3, 0x10); + muxer_write_chunk(mux_v, mpi->width*mpi->height*3, 0x10); return 1; } diff --git a/libmpcodecs/ve_vfw.c b/libmpcodecs/ve_vfw.c index c1a86da16e..c5589cb5a7 100644 --- a/libmpcodecs/ve_vfw.c +++ b/libmpcodecs/ve_vfw.c @@ -25,8 +25,6 @@ #include "muxer.h" -extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); - //===========================================================================// static char *vfw_param_codec = NULL; @@ -244,7 +242,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){ int ret; // flip_upside_down(vo_image_ptr,vo_image_ptr,3*vo_w,vo_h); // dirty hack ret=vfw_encode_frame(mux_v->bih, mux_v->buffer, vfw_bih, mpi->planes[0], &flags, 10000); - mencoder_write_chunk(mux_v,mux_v->bih->biSizeImage,flags); + muxer_write_chunk(mux_v,mux_v->bih->biSizeImage,flags); return 1; } diff --git a/libmpcodecs/ve_xvid.c b/libmpcodecs/ve_xvid.c index 12f1b64bbc..791f7839ec 100644 --- a/libmpcodecs/ve_xvid.c +++ b/libmpcodecs/ve_xvid.c @@ -65,7 +65,6 @@ static int const motion_presets[7] = { }; extern char* passtmpfile; -extern void mencoder_write_chunk(muxer_stream_t *s,int len,unsigned int flags); static int xvidenc_pass = 0; static int xvidenc_quality = 4; @@ -454,7 +453,7 @@ put_image(struct vf_instance_s* vf, mp_image_t *mpi) } // write output - mencoder_write_chunk(fp->mux, fp->enc_frame.length, fp->enc_frame.intra==1 ? 0x10 : 0); + muxer_write_chunk(fp->mux, fp->enc_frame.length, fp->enc_frame.intra==1 ? 0x10 : 0); // update the VBR engine vbrUpdate(&fp->vbr_state, enc_stats.quant, fp->enc_frame.intra, |