From 24627225c21738ec4f0737da536874e99d58d6ac Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期四, 19 九月 2019 18:01:29 +0800
Subject: [PATCH] update
---
csrc/ffmpeg/format/FormatIn.cpp | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/csrc/ffmpeg/format/FormatIn.cpp b/csrc/ffmpeg/format/FormatIn.cpp
index 4df2c0f..603fe96 100644
--- a/csrc/ffmpeg/format/FormatIn.cpp
+++ b/csrc/ffmpeg/format/FormatIn.cpp
@@ -100,17 +100,16 @@
handle_gb28181 = new GB28181API;
handle_gb28181->addCamera(fn);
- int ret = openWithCustomIO((void *)&handle_gb28181, handle_gb28181->readData, options);
+ int ret = openWithCustomIO(handle_gb28181, handle_gb28181->readData, options);
if(ret < 0){
logIt("do openWithCustomIO failed:%d",ret);
}
ret = avformat_open_input(&ctx_, "", NULL, options);
- if(ret < 0){
- logIt("open %s failed:%s",filename,
- getAVErrorDesc(ret).c_str());
-
- }
+ // if(ret < 0){
+ // logIt("open %s failed:%s",filename,
+ // getAVErrorDesc(ret).c_str());
+ // }
return ret;
}
@@ -119,11 +118,10 @@
int FormatIn::open(const char *filename, AVDictionary **options){
const int ret = avformat_open_input(&ctx_, filename, NULL, options);
- if(ret < 0){
- logIt("open %s failed:%s",filename,
- getAVErrorDesc(ret).c_str());
-
- }
+ // if(ret < 0){
+ // logIt("open %s failed:%s",filename,
+ // getAVErrorDesc(ret).c_str());
+ // }
return ret;
}
@@ -266,8 +264,8 @@
while (!founded){
const int ret = av_read_frame(ctx_, &pkt_out);
if(ret < 0){
- logIt("read frame from %s failed:%s",
- ctx_->filename,getAVErrorDesc(ret).c_str());
+ // logIt("read frame from %s failed:%s",
+ // ctx_->filename,getAVErrorDesc(ret).c_str());
return false;
}
--
Gitblit v1.8.0