summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
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 /libmpcodecs/vd_ffmpeg.c
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 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r--libmpcodecs/vd_ffmpeg.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index bdbb322694..60db717f58 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -33,7 +33,7 @@ LIBVD_EXTERN(ffmpeg)
#include "xvmc_render.h"
#endif
-int avcodec_inited=0;
+int avcodec_initialized=0;
typedef struct {
AVCodecContext *avctx;
@@ -41,7 +41,7 @@ typedef struct {
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 @@ static int init(sh_video_t *sh){
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 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
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 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){
}
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 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
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);