diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-01-21 01:27:56 +0100 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2011-01-25 03:15:18 +0200 |
| commit | 69fdb30400cd67922cfb612ed33403f4f91b3d03 (patch) | |
| tree | b19537a204a08af51298bded433aab65e7a28a59 /libmpcodecs | |
| parent | 83f37b54dedcfdb07684010571137697b3955b09 (diff) | |
| download | mpv-69fdb30400cd67922cfb612ed33403f4f91b3d03.tar.bz2 mpv-69fdb30400cd67922cfb612ed33403f4f91b3d03.tar.xz | |
mp_msg: Remove uses of MSGT_MENCODER
Some of the code that could run outside MEcoder used MSGT_MENCODER.
Replace those with appropriate MSGT_ types.
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_xvid4.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_lavc.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c index ee4ad93f58..779baef105 100644 --- a/libmpcodecs/vd_xvid4.c +++ b/libmpcodecs/vd_xvid4.c @@ -149,9 +149,9 @@ static int init(sh_video_t *sh) /* Gather some information about the host library */ if(xvid_global(NULL, XVID_GBL_INFO, &xvid_gbl_info, NULL) < 0) { - mp_msg(MSGT_MENCODER,MSGL_INFO, "xvid: could not get information about the library\n"); + mp_msg(MSGT_DECVIDEO,MSGL_INFO, "xvid: could not get information about the library\n"); } else { - mp_msg(MSGT_MENCODER,MSGL_INFO, "xvid: using library version %d.%d.%d (build %s)\n", + mp_msg(MSGT_DECVIDEO,MSGL_INFO, "xvid: using library version %d.%d.%d (build %s)\n", XVID_VERSION_MAJOR(xvid_gbl_info.actual_version), XVID_VERSION_MINOR(xvid_gbl_info.actual_version), XVID_VERSION_PATCH(xvid_gbl_info.actual_version), diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c index 2a1cf439f9..63de4ffdf5 100644 --- a/libmpcodecs/vf_lavc.c +++ b/libmpcodecs/vf_lavc.c @@ -74,12 +74,12 @@ static int config(struct vf_instance *vf, vf->priv->outbuf = malloc(vf->priv->outbuf_size); if (avcodec_open(&lavc_venc_context, vf->priv->codec) != 0) { - mp_tmsg(MSGT_MENCODER,MSGL_ERR,"Could not open codec.\n"); + mp_tmsg(MSGT_VFILTER,MSGL_ERR,"Could not open codec.\n"); return 0; } if (lavc_venc_context.codec->encode == NULL) { - mp_msg(MSGT_MENCODER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); + mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); return 0; } @@ -143,7 +143,7 @@ static int vf_open(vf_instance_t *vf, char *args){ vf->priv->codec = (AVCodec *)avcodec_find_encoder_by_name("mpeg1video"); if (!vf->priv->codec) { - mp_tmsg(MSGT_MENCODER,MSGL_ERR,"Cannot find codec '%s' in libavcodec...\n", "mpeg1video"); + mp_tmsg(MSGT_VFILTER,MSGL_ERR,"Cannot find codec '%s' in libavcodec...\n", "mpeg1video"); return 0; } |