From 0808cdee4bb69cb4543ae235becca4a106c719af Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Fri, 1 Mar 2019 18:47:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Drtmp=E8=A7=A3=E5=A4=8D?= =?UTF-8?q?=E7=94=A8=E5=99=A8=E5=8F=AF=E8=83=BD=E4=B8=A2=E5=A4=B1config?= =?UTF-8?q?=E5=B8=A7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/RtmpMuxer/RtmpDemuxer.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/RtmpMuxer/RtmpDemuxer.cpp b/src/RtmpMuxer/RtmpDemuxer.cpp index 2b452fc6..c369eb58 100644 --- a/src/RtmpMuxer/RtmpDemuxer.cpp +++ b/src/RtmpMuxer/RtmpDemuxer.cpp @@ -52,27 +52,27 @@ int RtmpDemuxer::getTrackCount(const AMFValue &metedata) { bool RtmpDemuxer::inputRtmp(const RtmpPacket::Ptr &pkt) { switch (pkt->typeId) { case MSG_VIDEO: { - if(_videoRtmpDecoder){ - return _videoRtmpDecoder->inputRtmp(pkt, true); - } if(!_tryedGetVideoTrack){ _tryedGetVideoTrack = true; auto codec = AMFValue(pkt->getMediaType()); makeVideoTrack(codec); } + if(_videoRtmpDecoder){ + return _videoRtmpDecoder->inputRtmp(pkt, true); + } return false; } case MSG_AUDIO: { - if(_audioRtmpDecoder){ - _audioRtmpDecoder->inputRtmp(pkt, false); - return false; - } if(!_tryedGetAudioTrack) { _tryedGetAudioTrack = true; auto codec = AMFValue(pkt->getMediaType()); makeAudioTrack(codec); } + if(_audioRtmpDecoder){ + _audioRtmpDecoder->inputRtmp(pkt, false); + return false; + } return false; } default: