From 2bad52df5fc3edc4674bb58107022d0d82d6e3d7 Mon Sep 17 00:00:00 2001
From: Prabhat Roy <prabhatroy@fb.com>
Date: Tue, 8 Jun 2021 15:51:05 +0100
Subject: [PATCH 1/2] Fixed some ffmpeg deprecation warnings in decoder

---
 torchvision/csrc/io/decoder/decoder.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/torchvision/csrc/io/decoder/decoder.cpp b/torchvision/csrc/io/decoder/decoder.cpp
index 6c9a3cdf825..c39e2aa187c 100644
--- a/torchvision/csrc/io/decoder/decoder.cpp
+++ b/torchvision/csrc/io/decoder/decoder.cpp
@@ -3,6 +3,7 @@
 #include <future>
 #include <iostream>
 #include <mutex>
+#include <libavutil/avutil.h>
 #include "audio_stream.h"
 #include "cc_stream.h"
 #include "subtitle_stream.h"
@@ -196,8 +197,10 @@ int64_t Decoder::seekCallback(int64_t offset, int whence) {
 void Decoder::initOnce() {
   static std::once_flag flagInit;
   std::call_once(flagInit, []() {
+#if LIBAVUTIL_VERSION_MAJOR < 56 // Before FFMPEG 4.0
     av_register_all();
     avcodec_register_all();
+#endif
     avformat_network_init();
     // register ffmpeg lock manager
     av_lockmgr_register(&ffmpeg_lock);
@@ -397,10 +400,14 @@ bool Decoder::init(
 }
 
 bool Decoder::openStreams(std::vector<DecoderMetadata>* metadata) {
-  for (int i = 0; i < inputCtx_->nb_streams; i++) {
+  for (unsigned int i = 0; i < inputCtx_->nb_streams; i++) {
     // - find the corespondent format at params_.formats set
     MediaFormat format;
+#if LIBAVUTIL_VERSION_MAJOR < 56 // Before FFMPEG 4.0
     const auto media = inputCtx_->streams[i]->codec->codec_type;
+#else // FFMPEG 4.0+
+    const auto media = inputCtx_->streams[i]->codecpar->codec_type;
+#endif
     if (!mapFfmpegType(media, &format.type)) {
       VLOG(1) << "Stream media: " << media << " at index " << i
               << " gets ignored, unknown type";

From dc8b1a51600aea10cc0301265f91f151aba06df1 Mon Sep 17 00:00:00 2001
From: Prabhat Roy <prabhatroy@fb.com>
Date: Tue, 8 Jun 2021 15:58:11 +0100
Subject: [PATCH 2/2] Fixed clang error

---
 torchvision/csrc/io/decoder/decoder.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/torchvision/csrc/io/decoder/decoder.cpp b/torchvision/csrc/io/decoder/decoder.cpp
index c39e2aa187c..a6361ca79ce 100644
--- a/torchvision/csrc/io/decoder/decoder.cpp
+++ b/torchvision/csrc/io/decoder/decoder.cpp
@@ -1,9 +1,9 @@
 #include "decoder.h"
 #include <c10/util/Logging.h>
+#include <libavutil/avutil.h>
 #include <future>
 #include <iostream>
 #include <mutex>
-#include <libavutil/avutil.h>
 #include "audio_stream.h"
 #include "cc_stream.h"
 #include "subtitle_stream.h"