From be9c1d1f659b0ff31f656424c478e83a4f7c53b5 Mon Sep 17 00:00:00 2001 From: zhangmeng <775834166@qq.com> Date: 星期五, 20 九月 2019 11:44:19 +0800 Subject: [PATCH] update ffmpeg --- cffmpeg.h | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cffmpeg.h b/cffmpeg.h index ef4ed72..a1d1473 100644 --- a/cffmpeg.h +++ b/cffmpeg.h @@ -17,17 +17,16 @@ void c_ffmpeg_run_gb28181(const cffmpeg h); void c_ffmepg_use_cpu(const cffmpeg h); /////////passive api -void c_ffmpeg_build_recorder(const cffmpeg h, const char*id, const char *dir, int mind, int maxd); +void c_ffmpeg_build_recorder(const cffmpeg h, const char*id, const char *dir, int mind, int maxd, int audio); void c_ffmpeg_fire_recorder(const cffmpeg h, const char*sid, const int64_t id); -char* c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, int *length); -char* c_ffmpeg_get_rec_id(const cffmpeg h, const char* p, int *length); +void c_ffmpeg_get_info_recorder(const cffmpeg h, int *index, char** recid, int *recidLen, char **fpath, int *pathLen); void c_ffmpeg_build_decoder(const cffmpeg h); -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); void* c_ffmpeg_get_avpacket(const cffmpeg h, int *size, int *key); //////test -void* c_ffmpeg_decode_jpeg(const cffmpeg h, const char *file, int *wid, int *hei); +void* c_ffmpeg_decode_jpeg(const char *file, int *wid, int *hei); // pic encoder void *c_ffmpeg_create_encoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi); -- Gitblit v1.8.0