Merge ../ZoneMinder.Steve into packetqueue
This commit is contained in:
commit
f67a58723c
|
@ -45,8 +45,10 @@ class FfmpegCamera : public Camera
|
||||||
AVFormatContext *mFormatContext;
|
AVFormatContext *mFormatContext;
|
||||||
int mVideoStreamId;
|
int mVideoStreamId;
|
||||||
int mAudioStreamId;
|
int mAudioStreamId;
|
||||||
AVCodecContext *mCodecContext;
|
AVCodecContext *mVideoCodecContext;
|
||||||
AVCodec *mCodec;
|
AVCodecContext *mAudioCodecContext;
|
||||||
|
AVCodec *mVideoCodec;
|
||||||
|
AVCodec *mAudioCodec;
|
||||||
AVFrame *mRawFrame;
|
AVFrame *mRawFrame;
|
||||||
AVFrame *mFrame;
|
AVFrame *mFrame;
|
||||||
_AVPIXELFORMAT imagePixFormat;
|
_AVPIXELFORMAT imagePixFormat;
|
||||||
|
|
Loading…
Reference in New Issue