package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-09-27 13:32:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[misc]: fix compiling error on Linux

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@123 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-08-18 13:07:40 +00:00
parent c0b913d3b9
commit 87f4cca33e
5 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
inc/mpp_buffer.h
View File

@@ -87,11 +87,7 @@ typedef struct {
#define mpp_buffer_commit(...) _mpp_buffer_commit(MODULE_TAG, ## __VA_ARGS__)
#define mpp_buffer_get(...) _mpp_buffer_get(MODULE_TAG, ## __VA_ARGS__)
#define mpp_buffer_put(...) _mpp_buffer_put(## __VA_ARGS__)
#define mpp_buffer_inc_ref(...) _mpp_buffer_inc_ref(## __VA_ARGS__)
#define mpp_buffer_group_get(...) _mpp_buffer_group_get(MODULE_TAG, ## __VA_ARGS__)
#define mpp_buffer_group_put(...) _mpp_buffer_group_put(## __VA_ARGS__)
#ifdef __cplusplus
extern "C" {
@@ -104,11 +100,11 @@ extern "C" {
*/
MPP_RET _mpp_buffer_commit(const char *tag, MppBufferGroup group, MppBufferCommit *buffer);
MPP_RET _mpp_buffer_get(const char *tag, MppBufferGroup group, MppBuffer *buffer, size_t size);
MPP_RET _mpp_buffer_put(MppBuffer *buffer);
MPP_RET _mpp_buffer_inc_ref(MppBuffer buffer);
MPP_RET mpp_buffer_put(MppBuffer *buffer);
MPP_RET mpp_buffer_inc_ref(MppBuffer buffer);
MPP_RET _mpp_buffer_group_get(const char *tag, MppBufferGroup *group, MppBufferType type);
MPP_RET _mpp_buffer_group_put(MppBufferGroup *group);
MPP_RET mpp_buffer_group_put(MppBufferGroup *group);
#ifdef __cplusplus
}

6
mpp/mpp_buffer.cpp
View File

@@ -32,12 +32,12 @@ MPP_RET _mpp_buffer_get(const char *tag, MppBufferGroup group, MppBuffer *buffer
return MPP_OK;
}
MPP_RET _mpp_buffer_put(MppBuffer *buffer)
MPP_RET mpp_buffer_put(MppBuffer *buffer)
{
return MPP_OK;
}
MPP_RET _mpp_buffer_inc_ref(MppBuffer buffer)
MPP_RET mpp_buffer_inc_ref(MppBuffer buffer)
{
return MPP_OK;
}
@@ -55,7 +55,7 @@ MPP_RET _mpp_buffer_group_get(const char *tag, MppBufferGroup *group, MppBufferT
return mpp_buffer_group_create(&p, tag, type);
}
MPP_RET _mpp_buffer_group_put(MppBufferGroup *group)
MPP_RET mpp_buffer_group_put(MppBufferGroup *group)
{
return MPP_OK;
}

2
mpp/mpp_buffer_impl.cpp
View File

@@ -20,8 +20,6 @@
#include "mpp_log.h"
#include "mpp_mem.h"
#include "mpp_common.h"
#include "mpp_buffer.h"
#include "mpp_buffer_impl.h"
#define MPP_BUFFER_SERVICE_LOCK() pthread_mutex_lock(&services.lock)

1
mpp/mpp_buffer_impl.h
View File

@@ -20,7 +20,6 @@
#include "mpp_list.h"
#include "mpp_common.h"
#include "mpp_buffer.h"
#include "mpp_thread.h"
#define MPP_BUF_DBG_FUNCTION (0x00000001)

2
osal/inc/mpp_common.h
View File

@@ -35,8 +35,8 @@
#define MPP_VSWAP(a, b) { a ^= b; b ^= a; a ^= b; }
#if defined(_WIN32) && !defined(__MINGW32CE__)
#include <stdio.h>
#if defined(_WIN32) && !defined(__MINGW32CE__)
#define snprintf _snprintf
#define fseeko _fseeki64
#elif defined(__MINGW32CE__)