From 4587f8d5507300782e329f9527f35f905f3bb697 Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期二, 29 十月 2019 14:13:25 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
---
csrc/worker/decoder.hpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/csrc/worker/decoder.hpp b/csrc/worker/decoder.hpp
index d157d25..a1946bd 100644
--- a/csrc/worker/decoder.hpp
+++ b/csrc/worker/decoder.hpp
@@ -12,6 +12,8 @@
struct AVFrame;
struct AVCodecContext;
+class CPacket;
+
namespace ffwrapper
{
class FormatIn;
@@ -40,10 +42,10 @@
private:
int initDecoder();
- int saveFrame(AVFrame *frame, int64_t &id);
+ int saveFrame(AVFrame *frame, const int64_t &id);
public:
void Start();
- int SetFrame(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id);
+ int SetFrame(const CPacket &pkt);
void GetFrame(unsigned char **data, int *w, int *h, int *format, int *length, int64_t *id);
public:
--
Gitblit v1.8.0