diff mbox series

[FFmpeg-devel,v3,3/3] avcodec/v4l2_m2m: Fix typo in log message and cosmetics

Message ID 20200216193144.14169-3-andriy.gelman@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel,v3,1/3] avcodec/v4l2_m2m_enc: Enable frame level rate control by default
Related show

Checks

Context Check Description
andriy/ffmpeg-patchwork pending
andriy/ffmpeg-patchwork success Applied patch
andriy/ffmpeg-patchwork success Configure finished
andriy/ffmpeg-patchwork success Make finished
andriy/ffmpeg-patchwork success Make fate finished

Commit Message

Andriy Gelman Feb. 16, 2020, 7:31 p.m. UTC
From: Andriy Gelman <andriy.gelman@gmail.com>

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
---
 libavcodec/v4l2_m2m.c     | 4 ++--
 libavcodec/v4l2_m2m_enc.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Mark Thompson Feb. 16, 2020, 8:34 p.m. UTC | #1
On 16/02/2020 19:31, Andriy Gelman wrote:
> From: Andriy Gelman <andriy.gelman@gmail.com>
> 
> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
> ---
>  libavcodec/v4l2_m2m.c     | 4 ++--
>  libavcodec/v4l2_m2m_enc.c | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c
> index d0bd4cd3d25..2d21f910bcc 100644
> --- a/libavcodec/v4l2_m2m.c
> +++ b/libavcodec/v4l2_m2m.c
> @@ -264,8 +264,8 @@ int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s)
>  
>      ret = ff_v4l2_context_set_status(&s->capture, VIDIOC_STREAMOFF);
>      if (ret) {
> -            av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n");
> -            goto error;
> +        av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n");
> +        goto error;
>      }
>  
>      /* release and unmmap the buffers */
> diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c
> index 5410cffe4a2..819f7e36109 100644
> --- a/libavcodec/v4l2_m2m_enc.c
> +++ b/libavcodec/v4l2_m2m_enc.c
> @@ -84,7 +84,7 @@ static inline int v4l2_get_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed i
>  
>      ret = ioctl(s->fd, VIDIOC_G_EXT_CTRLS, &ctrls);
>      if (ret < 0) {
> -        av_log(s->avctx, AV_LOG_WARNING, "Failed to set %s\n", name);
> +        av_log(s->avctx, AV_LOG_WARNING, "Failed to get %s\n", name);
>          return ret;
>      }
>  
> 

Yep, applied.

Thanks,

- Mark
diff mbox series

Patch

diff --git a/libavcodec/v4l2_m2m.c b/libavcodec/v4l2_m2m.c
index d0bd4cd3d25..2d21f910bcc 100644
--- a/libavcodec/v4l2_m2m.c
+++ b/libavcodec/v4l2_m2m.c
@@ -264,8 +264,8 @@  int ff_v4l2_m2m_codec_full_reinit(V4L2m2mContext *s)
 
     ret = ff_v4l2_context_set_status(&s->capture, VIDIOC_STREAMOFF);
     if (ret) {
-            av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n");
-            goto error;
+        av_log(log_ctx, AV_LOG_ERROR, "capture VIDIOC_STREAMOFF\n");
+        goto error;
     }
 
     /* release and unmmap the buffers */
diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c
index 5410cffe4a2..819f7e36109 100644
--- a/libavcodec/v4l2_m2m_enc.c
+++ b/libavcodec/v4l2_m2m_enc.c
@@ -84,7 +84,7 @@  static inline int v4l2_get_ext_ctrl(V4L2m2mContext *s, unsigned int id, signed i
 
     ret = ioctl(s->fd, VIDIOC_G_EXT_CTRLS, &ctrls);
     if (ret < 0) {
-        av_log(s->avctx, AV_LOG_WARNING, "Failed to set %s\n", name);
+        av_log(s->avctx, AV_LOG_WARNING, "Failed to get %s\n", name);
         return ret;
     }