From 0560a8fce4c9d005655fce5025bc0fda8c58bff8 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 02 十二月 2019 16:15:47 +0800
Subject: [PATCH] update
---
csrc/ffmpeg/format/FormatIn.cpp | 10 +++++-----
csrc/thirdparty/ffmpeg/lib/libavfilter.a | 0
csrc/thirdparty/ffmpeg/lib/libavcodec.a | 0
csrc/thirdparty/ffmpeg/lib/libavformat.a | 0
csrc/thirdparty/ffmpeg/lib/libswscale.a | 0
csrc/thirdparty/ffmpeg/lib/libavutil.a | 0
6 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 6aaefd3..5ca0182 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -200,11 +200,11 @@
hw_accl_ = false;
continue;
}
- if(codecpar->codec_id == AV_CODEC_ID_H264){
- dec = avcodec_find_decoder_by_name("h264_cuvid");
- }else if(codecpar->codec_id == AV_CODEC_ID_H265){
- dec = avcodec_find_decoder_by_name("hevc_cuvid");
- }
+
+ std::string codec_name(avcodec_get_name(codecpar->codec_id));
+ codec_name += "_cuvid";
+ dec = avcodec_find_decoder_by_name(codec_name.c_str());
+
if(!dec){
hw_accl_ = false;
continue;
diff --git a/csrc/thirdparty/ffmpeg/lib/libavcodec.a b/csrc/thirdparty/ffmpeg/lib/libavcodec.a
index f55312d..05f35ec 100644
--- a/csrc/thirdparty/ffmpeg/lib/libavcodec.a
+++ b/csrc/thirdparty/ffmpeg/lib/libavcodec.a
Binary files differ
diff --git a/csrc/thirdparty/ffmpeg/lib/libavfilter.a b/csrc/thirdparty/ffmpeg/lib/libavfilter.a
index 2f4de6e..d1b7d7e 100644
--- a/csrc/thirdparty/ffmpeg/lib/libavfilter.a
+++ b/csrc/thirdparty/ffmpeg/lib/libavfilter.a
Binary files differ
diff --git a/csrc/thirdparty/ffmpeg/lib/libavformat.a b/csrc/thirdparty/ffmpeg/lib/libavformat.a
index 75c2365..ef6f946 100644
--- a/csrc/thirdparty/ffmpeg/lib/libavformat.a
+++ b/csrc/thirdparty/ffmpeg/lib/libavformat.a
Binary files differ
diff --git a/csrc/thirdparty/ffmpeg/lib/libavutil.a b/csrc/thirdparty/ffmpeg/lib/libavutil.a
index 73ddf0b..81936d7 100644
--- a/csrc/thirdparty/ffmpeg/lib/libavutil.a
+++ b/csrc/thirdparty/ffmpeg/lib/libavutil.a
Binary files differ
diff --git a/csrc/thirdparty/ffmpeg/lib/libswscale.a b/csrc/thirdparty/ffmpeg/lib/libswscale.a
index f5f1607..60881be 100644
--- a/csrc/thirdparty/ffmpeg/lib/libswscale.a
+++ b/csrc/thirdparty/ffmpeg/lib/libswscale.a
Binary files differ
--
Gitblit v1.8.0