Merge branch 'master' of ssh://192.168.5.5:29418/valib/goffmpeg
# Conflicts:
# csrc/wrapper.cpp
# csrc/wrapper.hpp
# goffmpeg.go
| | |
|---|
| | | int fps_; |
|---|
| | | }; |
|---|
| | | |
|---|
| | | uint8_t* Decode(const char *file, const int gb, int *w, int *h); |
|---|
| | | |
|---|
| | | void *CreateEncoder(const int w, const int h, const int fps, const int br, const int scale_flag, const int gi); |
|---|
| | | void *CreateEncoder(const int w, const int h, const int fps, const int br, |
|---|
| | | const int pix_fmt, const int scale_flag, const int gi); |
|---|
| | | void DestroyEncoder(void *h); |
|---|
| | | int Encode(void *hdl, uint8_t *in, const int w, const int h, uint8_t **out, int *size, int *key); |
|---|
| | | int GetGb28181Pic(const char *filename, char *retData, int *retDataLen); |
|---|
