From b1af58a5877b72cdcfdeb1539b802549459bc997 Mon Sep 17 00:00:00 2001 From: GetAway Date: Tue, 18 Jun 2019 18:24:25 +0200 Subject: [PATCH 1/2] =?UTF-8?q?ffmpeg:=20fix=20error=20duplicate=20?= =?UTF-8?q?=E2=80=98const=E2=80=99=20declaration=20specifier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b61b2b55c0f13d48d0f103c35946e8423662b489 Author: GetAway Date: 2019-06-18 (Tue, 18 Jun 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/buff_ffmpeg.c | 2 +- libeplayer3/container/container_ffmpeg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libeplayer3/container/buff_ffmpeg.c b/libeplayer3/container/buff_ffmpeg.c index 43bc82a..8229380 100644 --- a/libeplayer3/container/buff_ffmpeg.c +++ b/libeplayer3/container/buff_ffmpeg.c @@ -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); diff --git a/libeplayer3/container/container_ffmpeg.c b/libeplayer3/container/container_ffmpeg.c index 9467513..564a57b 100644 --- a/libeplayer3/container/container_ffmpeg.c +++ b/libeplayer3/container/container_ffmpeg.c @@ -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); From 0cebff51ff58ae06be7d9099762da8cb09c6dcfd Mon Sep 17 00:00:00 2001 From: GetAway Date: Tue, 18 Jun 2019 18:35:04 +0200 Subject: [PATCH 2/2] flv2mpeg4_ffmpeg.c: fix warning unused parameter Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/34808c6b966c9e802fe4ebcf3e77be2ced78a364 Author: GetAway Date: 2019-06-18 (Tue, 18 Jun 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/flv2mpeg4_ffmpeg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libeplayer3/container/flv2mpeg4_ffmpeg.c b/libeplayer3/container/flv2mpeg4_ffmpeg.c index cc00144..bee39f2 100644 --- a/libeplayer3/container/flv2mpeg4_ffmpeg.c +++ b/libeplayer3/container/flv2mpeg4_ffmpeg.c @@ -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)