Project import generated by Copybara.

PiperOrigin-RevId: 267280553

mediapipe/calculators/video/opencv_video_decoder_calculator.cc

@@ -154,10 +154,6 @@ class OpenCvVideoDecoderCalculator : public CalculatorBase {
                      cv::COLOR_BGRA2RGBA);
       }
     }
-<<<<<<< HEAD
-    cc->Outputs().Tag("VIDEO").Add(image_frame.release(), timestamp);
-    decoded_frames_++;
-=======
     // If the timestamp of the current frame is not greater than the one of the
     // previous frame, the new frame will be discarded.
     if (prev_timestamp_ < timestamp) {
@@ -166,7 +162,6 @@ class OpenCvVideoDecoderCalculator : public CalculatorBase {
       decoded_frames_++;
     }
 
->>>>>>> Project import generated by Copybara.
     return ::mediapipe::OkStatus();
   }
 
@@ -189,10 +184,7 @@ class OpenCvVideoDecoderCalculator : public CalculatorBase {
   int frame_count_;
   int decoded_frames_ = 0;
   ImageFormat::Format format_;
-<<<<<<< HEAD
-=======
   Timestamp prev_timestamp_ = Timestamp::Unset();
->>>>>>> Project import generated by Copybara.
 };
 
 REGISTER_CALCULATOR(OpenCvVideoDecoderCalculator);