From 9792631e9d038ac34e287323961b78cc3d470873 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 24 九月 2019 17:18:11 +0800
Subject: [PATCH] bug fix
---
csrc/ffmpeg/format/FormatIn.cpp | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 6313eda..c5eb651 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -47,8 +47,11 @@
io_ctx_ = NULL;
}
if(ctx_){
- avformat_close_input(&ctx_);
- avformat_free_context(ctx_);
+ if (!ctx_->oformat){
+ avformat_free_context(ctx_);
+ }else{
+ avformat_close_input(&ctx_);
+ }
ctx_ = NULL;
if(dec_ctx_){
avcodec_close(dec_ctx_);
@@ -83,7 +86,7 @@
auto err = av_probe_input_buffer(ctx_->pb, &ctx_->iformat, NULL, NULL, 0, read_io_buff_size_);
if(err != 0){
logIt("open with custom io prob input buffer error:%d\n", err);
- logIt("failed:%s", getAVErrorDesc(err).c_str());
+ logIt("custom io failed:%s", getAVErrorDesc(err).c_str());
return -1;
}
@@ -106,9 +109,10 @@
int ret = openWithCustomIO(handle_gb28181, handle_gb28181->readData, options);
if(ret < 0){
logIt("do openWithCustomIO failed:%d",ret);
- }
+ }else{
+ ret = avformat_open_input(&ctx_, "", NULL, options);
+ }
- ret = avformat_open_input(&ctx_, "", NULL, options);
// if(ret < 0){
// logIt("open %s failed:%s",filename,
// getAVErrorDesc(ret).c_str());
--
Gitblit v1.8.0