diff libmpcodecs/vd_ffmpeg.c @ 25962:afa125da85cf

typo fix: inited --> initialized
author diego
date Thu, 14 Feb 2008 14:23:55 +0000
parents bb7c65f2a289
children 1318e956c092
line wrap: on
line diff
--- a/libmpcodecs/vd_ffmpeg.c	Wed Feb 13 21:36:27 2008 +0000
+++ b/libmpcodecs/vd_ffmpeg.c	Thu Feb 14 14:23:55 2008 +0000
@@ -33,7 +33,7 @@
 #include "xvmc_render.h"
 #endif
 
-int avcodec_inited=0;
+int avcodec_initialized=0;
 
 typedef struct {
     AVCodecContext *avctx;
@@ -41,7 +41,7 @@
     enum PixelFormat pix_fmt;
     int do_slices;
     int do_dr1;
-    int vo_inited;
+    int vo_initialized;
     int best_csp;
     int b_age;
     int ip_age[2];
@@ -227,10 +227,10 @@
     int lowres_w=0;
     int do_vis_debug= lavc_param_vismv || (lavc_param_debug&(FF_DEBUG_VIS_MB_TYPE|FF_DEBUG_VIS_QP));
 
-    if(!avcodec_inited){
+    if(!avcodec_initialized){
       avcodec_init();
       avcodec_register_all();
-      avcodec_inited=1;
+      avcodec_initialized=1;
       av_log_set_callback(mp_msp_av_log_callback);
     }
 
@@ -501,7 +501,7 @@
 	width != sh->disp_w  ||
 	height != sh->disp_h ||
 	pix_fmt != ctx->pix_fmt ||
-	!ctx->vo_inited)
+	!ctx->vo_initialized)
     {
 	mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
 	if (sh->aspect == 0 ||
@@ -541,7 +541,7 @@
 	}
     	if (!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h, ctx->best_csp))
     		return -1;
-	ctx->vo_inited = 1;
+	ctx->vo_initialized = 1;
     }
     return 0;
 }
@@ -742,7 +742,7 @@
     if (!dr1)
     avctx->draw_horiz_band=NULL;
     avctx->opaque=sh;
-    if(ctx->vo_inited && !(flags&3) && !dr1){
+    if(ctx->vo_initialized && !(flags&3) && !dr1){
 	mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE |
 	    (ctx->do_slices?MP_IMGFLAG_DRAW_CALLBACK:0),
 	    sh->disp_w, sh->disp_h);