From e8f727f24774d59fe1e6ea1e81ed7fc7680fa695 Mon Sep 17 00:00:00 2001 From: BPanther Date: Fri, 11 Jun 2021 01:24:35 +0200 Subject: [PATCH] small fixes Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ee9c3fc657075a91488e8249aa1cb7976e3ad52c Author: BPanther Date: 2021-06-11 (Fri, 11 Jun 2021) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3/container/flv2mpeg4_ffmpeg.c | 1 - libeplayer3/container/mpeg4p2_ffmpeg.c | 1 - libeplayer3/container/wrapped_ffmpeg.c | 2 -- libeplayer3/include/bcm_ioctls.h | 9 +-------- libeplayer3/include/debug.h | 3 +-- libeplayer3/include/manager.h | 2 +- libeplayer3/include/misc.h | 2 +- libeplayer3/include/output.h | 2 +- libeplayer3/include/stm_ioctls.h | 6 +++--- libeplayer3/playback/playback.c | 2 +- 10 files changed, 9 insertions(+), 21 deletions(-) diff --git a/libeplayer3/container/flv2mpeg4_ffmpeg.c b/libeplayer3/container/flv2mpeg4_ffmpeg.c index bee39f2..51408fe 100644 --- a/libeplayer3/container/flv2mpeg4_ffmpeg.c +++ b/libeplayer3/container/flv2mpeg4_ffmpeg.c @@ -92,4 +92,3 @@ static int flv2mpeg4_write_packet(Context_t *out_ctx, Flv2Mpeg4Context *mpeg4p2_ return flv2mpeg4_process_flv_packet(mpeg4p2_ctx->ctx, 0, pkt->data, pkt->size, time_ms); } - diff --git a/libeplayer3/container/mpeg4p2_ffmpeg.c b/libeplayer3/container/mpeg4p2_ffmpeg.c index ebcb959..68674fd 100755 --- a/libeplayer3/container/mpeg4p2_ffmpeg.c +++ b/libeplayer3/container/mpeg4p2_ffmpeg.c @@ -141,4 +141,3 @@ static void mpeg4p2_context_close(Mpeg4P2Context *context) return; } } - diff --git a/libeplayer3/container/wrapped_ffmpeg.c b/libeplayer3/container/wrapped_ffmpeg.c index b86e61f..a6ed9b8 100644 --- a/libeplayer3/container/wrapped_ffmpeg.c +++ b/libeplayer3/container/wrapped_ffmpeg.c @@ -207,5 +207,3 @@ static int64_t wrapped_frame_get_best_effort_timestamp(const AVFrame *frame) return frame->best_effort_timestamp; #endif } - - diff --git a/libeplayer3/include/bcm_ioctls.h b/libeplayer3/include/bcm_ioctls.h index f67fd31..af7b38b 100644 --- a/libeplayer3/include/bcm_ioctls.h +++ b/libeplayer3/include/bcm_ioctls.h @@ -35,7 +35,6 @@ typedef enum CT_VP9 } video_codec_type_t; - typedef enum { STREAMTYPE_UNKNOWN = -1, @@ -55,11 +54,9 @@ typedef enum STREAMTYPE_DIVX5 = 15, STREAMTYPE_VB6 = 18, STREAMTYPE_SPARK = 21, - STREAMTYPE_MJPEG = 30, + STREAMTYPE_MJPEG = 30 } video_stream_type_t; - - typedef enum { AUDIOTYPE_UNKNOWN = -1, @@ -79,8 +76,4 @@ typedef enum AUDIOTYPE_RAW = 0x30 } audio_stream_type_t; - - - #endif /* H_DVB_BCM_H */ - diff --git a/libeplayer3/include/debug.h b/libeplayer3/include/debug.h index 4365add..191ef27 100644 --- a/libeplayer3/include/debug.h +++ b/libeplayer3/include/debug.h @@ -6,7 +6,6 @@ #define log_error(fmt, x...) do { printf("[%s:%s] " fmt, __FILENAME__, __FUNCTION__, ## x); } while (0) #define log_printf(maxlevel, level, fmt, x...) do { if (maxlevel >= level) printf("[%s:%s] " fmt, __FILENAME__, __FUNCTION__, ## x); } while (0) - /******************************************* * ffmpeg *******************************************/ @@ -545,4 +544,4 @@ #define mjpeg_err(...) log_error(__VA_ARGS__) #else #define mjpeg_err(...) -#endif \ No newline at end of file +#endif diff --git a/libeplayer3/include/manager.h b/libeplayer3/include/manager.h index 1363271..7e8b983 100644 --- a/libeplayer3/include/manager.h +++ b/libeplayer3/include/manager.h @@ -25,7 +25,7 @@ typedef enum MANAGER_UPDATED_TRACK_INFO, MANAGER_REGISTER_UPDATED_TRACK_INFO, MANAGER_REF_LIST, - MANAGER_REF_LIST_SIZE, + MANAGER_REF_LIST_SIZE } ManagerCmd_t; typedef enum diff --git a/libeplayer3/include/misc.h b/libeplayer3/include/misc.h index 3992804..5611ce2 100644 --- a/libeplayer3/include/misc.h +++ b/libeplayer3/include/misc.h @@ -26,7 +26,7 @@ typedef enum STB_DREAMBOX, STB_VUPLUS, STB_HISILICON, - STB_OTHER = 999, + STB_OTHER = 999 } stb_type_t; /* ***************************** */ diff --git a/libeplayer3/include/output.h b/libeplayer3/include/output.h index 5dad251..f825bc4 100644 --- a/libeplayer3/include/output.h +++ b/libeplayer3/include/output.h @@ -29,7 +29,7 @@ typedef enum OUTPUT_GET_FRAME_COUNT, OUTPUT_GET_PROGRESSIVE, OUTPUT_SET_BUFFER_SIZE, - OUTPUT_GET_BUFFER_SIZE, + OUTPUT_GET_BUFFER_SIZE } OutputCmd_t; typedef struct diff --git a/libeplayer3/include/stm_ioctls.h b/libeplayer3/include/stm_ioctls.h index fcb19ee..6212053 100644 --- a/libeplayer3/include/stm_ioctls.h +++ b/libeplayer3/include/stm_ioctls.h @@ -129,7 +129,7 @@ typedef enum audio_spdif_source { AUDIO_SPDIF_SOURCE_PP, /*