diff options
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd_xvid4.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_framestep.c | 5 | ||||
| -rw-r--r-- | libmpcodecs/vf_lavc.c | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_tfields.c | 11 | ||||
| -rw-r--r-- | libmpcodecs/vf_yadif.c | 7 |
5 files changed, 13 insertions, 22 deletions
diff --git a/libmpcodecs/vd_xvid4.c b/libmpcodecs/vd_xvid4.c index 62eab8c3ed..779baef105 100644 --- a/libmpcodecs/vd_xvid4.c +++ b/libmpcodecs/vd_xvid4.c @@ -1,5 +1,5 @@ /* - * - XviD 1.x decoder module for mplayer/mencoder - + * - XviD 1.x decoder module for mplayer - * * Copyright(C) 2003 Marco Belli <elcabesa@inwind.it> * 2003-2004 Edouard Gomez <ed.gomez@free.fr> @@ -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_framestep.c b/libmpcodecs/vf_framestep.c index f4ded017ae..d6aad9a90a 100644 --- a/libmpcodecs/vf_framestep.c +++ b/libmpcodecs/vf_framestep.c @@ -14,9 +14,8 @@ * if you call the filter with the i (lowercase) * ... -vf framestep=i ... * then a I! followed by a cr is printed when a key frame (eg Intra frame) is - * found, leaving the current line of mplayer/mencoder, where you got the - * time, in seconds, and frame of the key. Use this information to split the - * AVI. + * found, leaving the current line of mplayer, where you got the time, in + * seconds, and frame of the key. Use this information to split the AVI. * * After the i or alone you can put a positive number and only one frame every * x (the number you set) is passed on the filter chain, limiting the output 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; } diff --git a/libmpcodecs/vf_tfields.c b/libmpcodecs/vf_tfields.c index ee50d4f6ca..52cd0b5684 100644 --- a/libmpcodecs/vf_tfields.c +++ b/libmpcodecs/vf_tfields.c @@ -336,8 +336,6 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) return continue_buffered_image(vf); } -extern const int under_mencoder; - static int continue_buffered_image(struct vf_instance *vf) { int i=vf->priv->buffered_i; @@ -390,8 +388,7 @@ static int continue_buffered_image(struct vf_instance *vf) dmpi->stride[2] = 2*mpi->stride[2]; } ret |= vf_next_put_image(vf, dmpi, pts); - if (!under_mencoder) - break; + break; } break; case 1: @@ -418,8 +415,7 @@ static int continue_buffered_image(struct vf_instance *vf) mpi->chroma_width, mpi->chroma_height, (i^!tff)); } ret |= vf_next_put_image(vf, dmpi, pts); - if (!under_mencoder) - break; + break; } break; case 2: @@ -442,8 +438,7 @@ static int continue_buffered_image(struct vf_instance *vf) dmpi->stride[2], mpi->stride[2]*2, (i^!tff)); } ret |= vf_next_put_image(vf, dmpi, pts); - if (!under_mencoder) - break; + break; } break; } diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index 25a84ba0e7..2b2c180405 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -411,8 +411,6 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){ return continue_buffered_image(vf); } -extern const int under_mencoder; - static int continue_buffered_image(struct vf_instance *vf) { mp_image_t *mpi = vf->priv->buffered_mpi; @@ -431,11 +429,10 @@ static int continue_buffered_image(struct vf_instance *vf) mpi->width,mpi->height); vf_clone_mpi_attributes(dmpi, mpi); filter(vf->priv, dmpi->planes, dmpi->stride, mpi->w, mpi->h, i ^ tff ^ 1, tff); - if (i < (vf->priv->mode & 1) && !under_mencoder) + if (i < (vf->priv->mode & 1)) vf_queue_frame(vf, continue_buffered_image); ret |= vf_next_put_image(vf, dmpi, pts /*FIXME*/); - if (!under_mencoder) - break; + break; } vf->priv->buffered_i = 1; return ret; |