From a6dd7933e0bd8ae1fd083639758f7fee9fc7a151 Mon Sep 17 00:00:00 2001 From: chenshijun <csj_sky@126.com> Date: 星期二, 10 九月 2019 16:34:10 +0800 Subject: [PATCH] Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg --- csrc/cffmpeg.cpp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/csrc/cffmpeg.cpp b/csrc/cffmpeg.cpp index cdbd2f0..3383b31 100644 --- a/csrc/cffmpeg.cpp +++ b/csrc/cffmpeg.cpp @@ -90,10 +90,10 @@ s->BuildDecoder(); } -void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei){ +void* c_ffmpeg_get_pic_decoder(const cffmpeg h, int *wid, int *hei, int64_t *id){ Wrapper *s = (Wrapper*)h; unsigned char *data = NULL; - s->GetPicDecoder(&data, wid, hei); + s->GetPicDecoder(&data, wid, hei, id); return data; } -- Gitblit v1.8.0