diff mbox series

[meta-arago,master] gstreamer1.0-plugins-good: Fix patch fuzz

Message ID 20230707220952.8460-1-reatmon@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master] gstreamer1.0-plugins-good: Fix patch fuzz | expand

Commit Message

Ryan Eatmon July 7, 2023, 10:09 p.m. UTC 
Clean up a little patch fuzz with applying this patch against a newer
version on master.

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 .../0001-v4l2-Changes-for-DMA-Buf-import-j721s2.patch     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Changes-for-DMA-Buf-import-j721s2.patch b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Changes-for-DMA-Buf-import-j721s2.patch
index 4ef17a8d..79176749 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Changes-for-DMA-Buf-import-j721s2.patch
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Changes-for-DMA-Buf-import-j721s2.patch
@@ -95,16 +95,16 @@  diff --git a/sys/v4l2/gstv4l2videodec.c b/sys/v4l2/gstv4l2videodec.c
 index 3042995..0e4ac09 100644
 --- a/sys/v4l2/gstv4l2videodec.c
 +++ b/sys/v4l2/gstv4l2videodec.c
-@@ -536,6 +536,8 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder)
+@@ -738,6 +738,8 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder)
    GstVideoCodecFrame *frame;
    GstBuffer *buffer = NULL;
    GstFlowReturn ret;
 +  GstV4l2MemoryGroup *group;
 +  int buffer_valid=0;
 
-   GST_LOG_OBJECT (decoder, "Allocate output buffer");
+   GST_LOG_OBJECT (self, "Looping.");
 
-@@ -558,6 +560,7 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder)
+@@ -795,6 +797,7 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder)
 
      if (ret != GST_FLOW_OK)
        goto beach;
@@ -112,7 +112,7 @@  index 3042995..0e4ac09 100644
 
      GST_LOG_OBJECT (decoder, "Process output buffer");
      {
-@@ -602,13 +605,18 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder)
+@@ -861,13 +864,18 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder)
      if (oldest_frame)
        gst_video_codec_frame_unref (oldest_frame);