mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git
synced 2025-08-26 23:12:44 +02:00
Merge branch 'master' of https://bitbucket.org/max_10/libstb-hal-max
Origin commit data
------------------
Branch: master
Commit: f76881e792
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-06-18 (Tue, 18 Jun 2019)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -188,7 +188,7 @@ void getfillerMutex(const char *filename __attribute__((unused)), const char *fu
|
||||
ffmpeg_printf(100, "::%d received mutex\n", line);
|
||||
}
|
||||
|
||||
void releasefillerMutex(const char *filename __attribute__((unused)), const const char *function __attribute__((unused)), int line __attribute__((unused)))
|
||||
void releasefillerMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int line __attribute__((unused)))
|
||||
{
|
||||
pthread_mutex_unlock(&fillermutex);
|
||||
|
||||
|
@@ -158,7 +158,7 @@ static void getMutex(const char *filename __attribute__((unused)), const char *f
|
||||
ffmpeg_printf(100, "::%d received mutex\n", line);
|
||||
}
|
||||
|
||||
static void releaseMutex(const char *filename __attribute__((unused)), const const char *function __attribute__((unused)), int32_t line __attribute__((unused)))
|
||||
static void releaseMutex(const char *filename __attribute__((unused)), const char *function __attribute__((unused)), int32_t line __attribute__((unused)))
|
||||
{
|
||||
pthread_mutex_unlock(&mutex);
|
||||
|
||||
|
@@ -17,7 +17,7 @@ typedef struct
|
||||
} Flv2Mpeg4Context;
|
||||
|
||||
|
||||
static int flv2mpeg4_context_write_packet_cb(void *usr_data, int keyframe, int pts, const uint8_t *buf, int size)
|
||||
static int flv2mpeg4_context_write_packet_cb(void *usr_data, int keyframe __attribute__((unused)), int pts __attribute__((unused)), const uint8_t *buf, int size)
|
||||
{
|
||||
Flv2Mpeg4Context *ctx = usr_data;
|
||||
if (!ctx)
|
||||
@@ -46,7 +46,7 @@ static int flv2mpeg4_context_write_packet_cb(void *usr_data, int keyframe, int p
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int flv2mpeg4_context_write_extradata_cb(void *usr_data, int width, int height, int bitrate, const uint8_t *extradata, int extradatasize)
|
||||
static int flv2mpeg4_context_write_extradata_cb(void *usr_data, int width __attribute__((unused)), int height __attribute__((unused)), int bitrate __attribute__((unused)), const uint8_t *extradata, int extradatasize)
|
||||
{
|
||||
Flv2Mpeg4Context *ctx = usr_data;
|
||||
if (!ctx)
|
||||
|
Reference in New Issue
Block a user