diff options
| author | Colin Cross <ccross@android.com> | 2021-08-26 22:34:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-26 22:34:52 +0000 |
| commit | 40b2cf3f0b790a10b588e1f3a255462825dd630c (patch) | |
| tree | 08f815bfcdaed1c2137de2d6966e42a8870dedb0 /cast/standalone_sender/ffmpeg_glue.cc | |
| parent | 368c9cf3bcd4f3439ea1c1e35515a9f163d2ffbf (diff) | |
| parent | 307f4f004b06572ec342cc80eba3a1802f57ffc5 (diff) | |
| download | openscreen-40b2cf3f0b790a10b588e1f3a255462825dd630c.tar.gz | |
Upgrade openscreen to f54d92523c9f2c8c5afb99e05fed70e4b8772b1c am: 6b563cff6f am: 8c1d656299 am: be7732ab4d am: e9172c38c1 am: 307f4f004b
Original change: https://android-review.googlesource.com/c/platform/external/openscreen/+/1810936
Change-Id: I013ded6d29020d3ea1f0ca04dd91d134214f58e1
Diffstat (limited to 'cast/standalone_sender/ffmpeg_glue.cc')
| -rw-r--r-- | cast/standalone_sender/ffmpeg_glue.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/cast/standalone_sender/ffmpeg_glue.cc b/cast/standalone_sender/ffmpeg_glue.cc index a6645886..7f476582 100644 --- a/cast/standalone_sender/ffmpeg_glue.cc +++ b/cast/standalone_sender/ffmpeg_glue.cc @@ -4,6 +4,8 @@ #include "cast/standalone_sender/ffmpeg_glue.h" +#include <libavcodec/version.h> + #include "util/osp_logging.h" namespace openscreen { @@ -12,6 +14,13 @@ namespace internal { AVFormatContext* CreateAVFormatContextForFile(const char* path) { AVFormatContext* format_context = nullptr; +#if LIBAVCODEC_VERSION_MAJOR < 59 +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + av_register_all(); +#pragma GCC diagnostic pop +#endif // LIBAVCODEC_VERSION_MAJOR < 59 + int result = avformat_open_input(&format_context, path, nullptr, nullptr); if (result < 0) { OSP_LOG_ERROR << "Cannot open " << path << ": " << av_err2str(result); |