summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-14 14:23:55 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-14 14:23:55 +0000
commit835c654bb0089933c5dd85a8ca123581cda1169e (patch)
treea49757d0460577d3b70c63bf9a36ec714ff3a81a /libvo
parent440d7d25755bc850b7ee58e88e2bd8d6c18baea7 (diff)
downloadmpv-835c654bb0089933c5dd85a8ca123581cda1169e.tar.bz2
mpv-835c654bb0089933c5dd85a8ca123581cda1169e.tar.xz
typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/jpeg_enc.c6
-rw-r--r--libvo/mga_common.c2
-rw-r--r--libvo/vo_directx.c6
-rw-r--r--libvo/vo_dxr2.c2
-rw-r--r--libvo/vo_vesa.c2
-rw-r--r--libvo/vo_x11.c2
-rw-r--r--libvo/vo_xmga.c8
-rw-r--r--libvo/vo_xv.c2
-rw-r--r--libvo/x11_common.c2
9 files changed, 16 insertions, 16 deletions
diff --git a/libvo/jpeg_enc.c b/libvo/jpeg_enc.c
index a97acb8f6c..6e7fa2dacd 100644
--- a/libvo/jpeg_enc.c
+++ b/libvo/jpeg_enc.c
@@ -39,7 +39,7 @@
#include "jpeg_enc.h"
-extern int avcodec_inited;
+extern int avcodec_initialized;
/* Begin excessive code duplication ************************************/
@@ -319,11 +319,11 @@ jpeg_enc_t *jpeg_enc_init(int w, int h, int y_psize, int y_rsize,
/* if libavcodec is used by the decoder then we must not
* initialize again, but if it is not initialized then we must
* initialize it here. */
- if (!avcodec_inited) {
+ if (!avcodec_initialized) {
/* we need to initialize libavcodec */
avcodec_init();
avcodec_register_all();
- avcodec_inited=1;
+ avcodec_initialized=1;
}
if (ff_mjpeg_encode_init(j->s) < 0) {
diff --git a/libvo/mga_common.c b/libvo/mga_common.c
index dce62abeac..b150b18012 100644
--- a/libvo/mga_common.c
+++ b/libvo/mga_common.c
@@ -327,7 +327,7 @@ static int control(uint32_t request, void *data, ...)
vo_x11_ontop();
return VO_TRUE;
case VOCTRL_GET_PANSCAN:
- if ( !inited || !vo_fs ) return VO_FALSE;
+ if ( !initialized || !vo_fs ) return VO_FALSE;
return VO_TRUE;
case VOCTRL_FULLSCREEN:
vo_x11_fullscreen();
diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c
index fd2693460d..356304ce6e 100644
--- a/libvo/vo_directx.c
+++ b/libvo/vo_directx.c
@@ -375,7 +375,7 @@ static void uninit(void)
FreeLibrary( hddraw_dll);
hddraw_dll= NULL;
mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>ddraw.dll freed\n");
- mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>uninited\n");
+ mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>uninitialized\n");
}
static BOOL WINAPI EnumCallbackEx(GUID FAR *lpGUID, LPSTR lpDriverDescription, LPSTR lpDriverName, LPVOID lpContext, HMONITOR hm)
@@ -509,7 +509,7 @@ static uint32_t Directx_InitDirectDraw()
mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>can't set displaymode\n");
return 1;
}
- mp_msg(MSGT_VO, MSGL_V,"<vo_directx><INFO>Inited adapter %i for %i x %i @ %i \n",vo_adapter_num,vm_width,vm_height,vm_bpp);
+ mp_msg(MSGT_VO, MSGL_V,"<vo_directx><INFO>Initialized adapter %i for %i x %i @ %i \n",vo_adapter_num,vm_width,vm_height,vm_bpp);
return 0;
}
if (g_lpdd->lpVtbl->SetCooperativeLevel(g_lpdd, hWnd, DDSCL_NORMAL) != DD_OK) // or DDSCL_SETFOCUSWINDOW
@@ -517,7 +517,7 @@ static uint32_t Directx_InitDirectDraw()
mp_msg(MSGT_VO, MSGL_FATAL,"<vo_directx><FATAL ERROR>could not set cooperativelevel for hardwarecheck\n");
return 1;
}
- mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>DirectDraw Inited\n");
+ mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>DirectDraw Initialized\n");
return 0;
}
diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c
index 37f093ec98..93ad86f610 100644
--- a/libvo/vo_dxr2.c
+++ b/libvo/vo_dxr2.c
@@ -841,7 +841,7 @@ static int preinit(const char *arg) {
use_ol = 0;
} else {
uint32_t fmt = IMGFMT_BGR24;
- mp_msg(MSGT_VO,MSGL_V,"VO: [dxr2] Sub vo %s inited\n",arg);
+ mp_msg(MSGT_VO,MSGL_V,"VO: [dxr2] Sub vo %s initialized\n",arg);
if(sub_vo->control(VOCTRL_QUERY_FORMAT,&fmt) <= 0) {
mp_msg(MSGT_VO,MSGL_WARN,"VO: [dxr2] Sub vo %s doesn't support BGR24 => no overlay\n",arg);
sub_vo->uninit();
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c
index 0e64c6621f..0eaa47b07b 100644
--- a/libvo/vo_vesa.c
+++ b/libvo/vo_vesa.c
@@ -1046,7 +1046,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin
static void
uninit(void)
{
- // not inited
+ // not initialized
vesa_term();
if( mp_msg_test(MSGT_VO,MSGL_DBG3) )
mp_msg(MSGT_VO,MSGL_DBG3, "vo_vesa: uninit was called\n");
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index c5e5a2a069..ca79dab24f 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -25,7 +25,7 @@
static int Shmem_Flag;
-//static int Quiet_Flag; Here also what is this for. It's used but isn't inited ?
+//static int Quiet_Flag; Here also what is this for. It's used but isn't initialized?
static XShmSegmentInfo Shminfo[1];
static int gXErrorFlag;
static int CompletionType = -1;
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index 1ca7acd9c6..175bda9533 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -68,7 +68,7 @@ static Window mRoot;
static XSetWindowAttributes xWAttribs;
-static int inited = 0;
+static int initialized = 0;
#define VO_XMGA
#include "mga_common.c"
@@ -169,7 +169,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
}
mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
- inited = 1;
+ initialized = 1;
#ifdef HAVE_NEW_GUI
if (use_gui)
@@ -262,8 +262,8 @@ static void uninit(void)
{
mp_msg(MSGT_VO, MSGL_V, "vo: uninit!\n");
mga_uninit();
- if (!inited)
+ if (!initialized)
return; // no window?
- inited = 0;
+ initialized = 0;
vo_x11_uninit(); // destroy the window
}
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 2a3898889c..7584a74c43 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -45,7 +45,7 @@ Buffer allocation:
#include "gui/interface.h"
#endif
-#include "libavutil/common.h"
+#include "ffmpeg/libavutil/common.h"
static const vo_info_t info = {
"X11/Xv",
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index bf92a37032..2ed8ff31c6 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -546,7 +546,7 @@ void vo_uninit(void)
if (!mDisplay)
{
mp_msg(MSGT_VO, MSGL_V,
- "vo: x11 uninit called but X11 not inited..\n");
+ "vo: x11 uninit called but X11 not initialized..\n");
return;
}
// if( !vo_depthonscreen ) return;