From cdfb8eb2a956d25d688033be735f4741b2ab58bd Mon Sep 17 00:00:00 2001 From: xuxiuxi <554325746@qq.com> Date: 星期五, 15 三月 2019 09:48:42 +0800 Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c++ into yw.1.2.fixbug --- QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h index a593baa..235cbed 100644 --- a/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h +++ b/QiaoJiaSystem/GB28181DecoderModel/FFmpegDecoderJPG.h @@ -166,7 +166,18 @@ //瀵规敹鍒扮殑甯ц繘琛岃鏁� int64_t m_frameIndex = 0; +//******************************************* + AVFormatContext *ic; + unsigned char *iobuffer; + AVIOContext *avio; + AVStream *stream; + AVCodecContext *ctx; + AVCodec *codec; + AVCodec *codec_cuvid; + AVPacket pkt; + AVFrame *frame; + //******************************************* //灏嗗抚淇濆瓨鍒板抚鏁扮粍 void SaveToPacketVector(AVPacket &packet); @@ -188,7 +199,7 @@ int stopWrite(); //瀵筽acket鍋氳浆鎹� - void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream); + void conversion(void *packet, const long int &firstKeyPts, const long int &firstKeyDts, void *inVideoStream, unsigned long int frame_index = 0); bool m_bstartWrite = {false}; bool m_bFirstKeyFrame = {false}; -- Gitblit v1.8.0