small fixes

This commit is contained in:
BPanther
2021-06-11 01:24:35 +02:00
committed by Thilo Graf
parent 4f5a51c619
commit 3d9e2bfad7
10 changed files with 9 additions and 21 deletions

View File

@@ -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); return flv2mpeg4_process_flv_packet(mpeg4p2_ctx->ctx, 0, pkt->data, pkt->size, time_ms);
} }

View File

@@ -141,4 +141,3 @@ static void mpeg4p2_context_close(Mpeg4P2Context *context)
return; return;
} }
} }

View File

@@ -207,5 +207,3 @@ static int64_t wrapped_frame_get_best_effort_timestamp(const AVFrame *frame)
return frame->best_effort_timestamp; return frame->best_effort_timestamp;
#endif #endif
} }

View File

@@ -35,7 +35,6 @@ typedef enum
CT_VP9 CT_VP9
} video_codec_type_t; } video_codec_type_t;
typedef enum typedef enum
{ {
STREAMTYPE_UNKNOWN = -1, STREAMTYPE_UNKNOWN = -1,
@@ -55,11 +54,9 @@ typedef enum
STREAMTYPE_DIVX5 = 15, STREAMTYPE_DIVX5 = 15,
STREAMTYPE_VB6 = 18, STREAMTYPE_VB6 = 18,
STREAMTYPE_SPARK = 21, STREAMTYPE_SPARK = 21,
STREAMTYPE_MJPEG = 30, STREAMTYPE_MJPEG = 30
} video_stream_type_t; } video_stream_type_t;
typedef enum typedef enum
{ {
AUDIOTYPE_UNKNOWN = -1, AUDIOTYPE_UNKNOWN = -1,
@@ -79,8 +76,4 @@ typedef enum
AUDIOTYPE_RAW = 0x30 AUDIOTYPE_RAW = 0x30
} audio_stream_type_t; } audio_stream_type_t;
#endif /* H_DVB_BCM_H */ #endif /* H_DVB_BCM_H */

View File

@@ -6,7 +6,6 @@
#define log_error(fmt, x...) do { printf("[%s:%s] " fmt, __FILENAME__, __FUNCTION__, ## x); } while (0) #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) #define log_printf(maxlevel, level, fmt, x...) do { if (maxlevel >= level) printf("[%s:%s] " fmt, __FILENAME__, __FUNCTION__, ## x); } while (0)
/******************************************* /*******************************************
* ffmpeg * ffmpeg
*******************************************/ *******************************************/

View File

@@ -25,7 +25,7 @@ typedef enum
MANAGER_UPDATED_TRACK_INFO, MANAGER_UPDATED_TRACK_INFO,
MANAGER_REGISTER_UPDATED_TRACK_INFO, MANAGER_REGISTER_UPDATED_TRACK_INFO,
MANAGER_REF_LIST, MANAGER_REF_LIST,
MANAGER_REF_LIST_SIZE, MANAGER_REF_LIST_SIZE
} ManagerCmd_t; } ManagerCmd_t;
typedef enum typedef enum

View File

@@ -26,7 +26,7 @@ typedef enum
STB_DREAMBOX, STB_DREAMBOX,
STB_VUPLUS, STB_VUPLUS,
STB_HISILICON, STB_HISILICON,
STB_OTHER = 999, STB_OTHER = 999
} stb_type_t; } stb_type_t;
/* ***************************** */ /* ***************************** */

View File

@@ -29,7 +29,7 @@ typedef enum
OUTPUT_GET_FRAME_COUNT, OUTPUT_GET_FRAME_COUNT,
OUTPUT_GET_PROGRESSIVE, OUTPUT_GET_PROGRESSIVE,
OUTPUT_SET_BUFFER_SIZE, OUTPUT_SET_BUFFER_SIZE,
OUTPUT_GET_BUFFER_SIZE, OUTPUT_GET_BUFFER_SIZE
} OutputCmd_t; } OutputCmd_t;
typedef struct typedef struct

View File

@@ -129,7 +129,7 @@ typedef enum audio_spdif_source
{ {
AUDIO_SPDIF_SOURCE_PP, /*<! normal decoder output */ AUDIO_SPDIF_SOURCE_PP, /*<! normal decoder output */
AUDIO_SPDIF_SOURCE_DEC, /*<! decoder output w/o post-proc */ AUDIO_SPDIF_SOURCE_DEC, /*<! decoder output w/o post-proc */
AUDIO_SPDIF_SOURCE_ES, /*<! raw elementary stream data */ AUDIO_SPDIF_SOURCE_ES /*<! raw elementary stream data */
} audio_spdif_source_t; } audio_spdif_source_t;
typedef struct typedef struct
@@ -154,7 +154,7 @@ typedef enum
{ {
AUDIO_DISCONTINUITY_SKIP = DVB_DISCONTINUITY_SKIP, AUDIO_DISCONTINUITY_SKIP = DVB_DISCONTINUITY_SKIP,
AUDIO_DISCONTINUITY_CONTINUOUS_REVERSE = DVB_DISCONTINUITY_CONTINUOUS_REVERSE, AUDIO_DISCONTINUITY_CONTINUOUS_REVERSE = DVB_DISCONTINUITY_CONTINUOUS_REVERSE,
AUDIO_DISCONTINUITY_SURPLUS_DATA = DVB_DISCONTINUITY_SURPLUS_DATA, AUDIO_DISCONTINUITY_SURPLUS_DATA = DVB_DISCONTINUITY_SURPLUS_DATA
} audio_discontinuity_t; } audio_discontinuity_t;
/* /*
@@ -164,7 +164,7 @@ typedef enum
{ {
VIDEO_DISCONTINUITY_SKIP = DVB_DISCONTINUITY_SKIP, VIDEO_DISCONTINUITY_SKIP = DVB_DISCONTINUITY_SKIP,
VIDEO_DISCONTINUITY_CONTINUOUS_REVERSE = DVB_DISCONTINUITY_CONTINUOUS_REVERSE, VIDEO_DISCONTINUITY_CONTINUOUS_REVERSE = DVB_DISCONTINUITY_CONTINUOUS_REVERSE,
VIDEO_DISCONTINUITY_SURPLUS_DATA = DVB_DISCONTINUITY_SURPLUS_DATA, VIDEO_DISCONTINUITY_SURPLUS_DATA = DVB_DISCONTINUITY_SURPLUS_DATA
} video_discontinuity_t; } video_discontinuity_t;
#define DVB_TIME_NOT_BOUNDED 0xfedcba9876543210ULL #define DVB_TIME_NOT_BOUNDED 0xfedcba9876543210ULL

View File

@@ -1014,5 +1014,5 @@ PlaybackHandler_t PlaybackHandler =
0, //size 0, //size
0, //noprobe 0, //noprobe
0, //isLoopMode 0, //isLoopMode
0, //isTSLiveMode 0 //isTSLiveMode
}; };