From 3143aab798b6ea93a472a6b32f69a6aabc7da04e Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 16:28:25 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2
---
QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
index c701ddb..859ddd8 100644
--- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
+++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.cpp
@@ -144,8 +144,8 @@
void BASICGB28181::FFmpegDecoderJPG::BareFlowDecoderThd(FFmpegDecoderJPG *p_this) {
DBG(p_this->m_camIdx << " BareFlowDecoderThd ok ... gpuIdx is " << p_this->m_gpuIdx);
p_this->m_running = true;
- av_register_all();
- avformat_network_init();
+// av_register_all();
+// avformat_network_init();
p_this->ic = avformat_alloc_context();
p_this->iobuffer = (unsigned char *) av_malloc(p_this->m_buf_size);
--
Gitblit v1.8.0