Commit f0b34833 authored by Maxim Bublis's avatar Maxim Bublis Committed by Rémi Denis-Courmont

Fixed warnings on duplicate const modifiers.

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent 7dcd1665
...@@ -342,7 +342,7 @@ static const char *const enc_profile_list_text[] = ...@@ -342,7 +342,7 @@ static const char *const enc_profile_list_text[] =
N_("Main Profile"), N_("Main Profile"),
}; };
static const char *const const ppsz_enc_options[] = { static const char *const ppsz_enc_options[] = {
ENC_RATE_CONTROL, ENC_GOP_STRUCTURE, ENC_QUALITY, ENC_NOISE_THRESHOLD, ENC_BITRATE, ENC_RATE_CONTROL, ENC_GOP_STRUCTURE, ENC_QUALITY, ENC_NOISE_THRESHOLD, ENC_BITRATE,
ENC_MIN_BITRATE, ENC_MAX_BITRATE, ENC_AU_DISTANCE, ENC_CHROMAFMT, ENC_MIN_BITRATE, ENC_MAX_BITRATE, ENC_AU_DISTANCE, ENC_CHROMAFMT,
ENC_PREFILTER, ENC_PREFILTER_STRENGTH, ENC_CODINGMODE, ENC_MCBLK_SIZE, ENC_PREFILTER, ENC_PREFILTER_STRENGTH, ENC_CODINGMODE, ENC_MCBLK_SIZE,
......
...@@ -441,7 +441,7 @@ static const char *const direct_pred_list[] = ...@@ -441,7 +441,7 @@ static const char *const direct_pred_list[] =
static const char *const direct_pred_list_text[] = static const char *const direct_pred_list_text[] =
{ N_("None"), N_("Spatial"), N_("Temporal"), N_("Auto") }; { N_("None"), N_("Spatial"), N_("Temporal"), N_("Auto") };
static const int const framepacking_list[] = static const int framepacking_list[] =
{ -1, 0, 1, 2, 3, 4, 5 }; { -1, 0, 1, 2, 3, 4, 5 };
static const char *const framepacking_list_text[] = static const char *const framepacking_list_text[] =
{ "", N_("checkerboard"), N_("column alternation"), N_("row alternation"), N_("side by side"), N_("top bottom"), N_("frame alternation") }; { "", N_("checkerboard"), N_("column alternation"), N_("row alternation"), N_("side by side"), N_("top bottom"), N_("frame alternation") };
......
...@@ -43,13 +43,13 @@ ...@@ -43,13 +43,13 @@
#include "dbus_root.h" #include "dbus_root.h"
#include "dbus_common.h" #include "dbus_common.h"
static const char const ppsz_supported_uri_schemes[][9] = { static const char ppsz_supported_uri_schemes[][9] = {
"file", "http", "https", "rtsp", "realrtsp", "pnm", "ftp", "mtp", "smb", "file", "http", "https", "rtsp", "realrtsp", "pnm", "ftp", "mtp", "smb",
"mms", "mmsu", "mmst", "mmsh", "unsv", "itpc", "icyx", "rtmp", "rtp", "mms", "mmsu", "mmst", "mmsh", "unsv", "itpc", "icyx", "rtmp", "rtp",
"dccp", "dvd", "vcd", "vcdx" "dccp", "dvd", "vcd", "vcdx"
}; };
static const char const ppsz_supported_mime_types[][26] = { static const char ppsz_supported_mime_types[][26] = {
"audio/mpeg", "audio/x-mpeg", "audio/mpeg", "audio/x-mpeg",
"video/mpeg", "video/x-mpeg", "video/mpeg", "video/x-mpeg",
"video/mpeg-system", "video/x-mpeg-system", "video/mpeg-system", "video/x-mpeg-system",
......
...@@ -2597,7 +2597,7 @@ static void Ogg_ReadSkeletonBones( demux_t *p_demux, ogg_packet *p_oggpacket ) ...@@ -2597,7 +2597,7 @@ static void Ogg_ReadSkeletonBones( demux_t *p_demux, ogg_packet *p_oggpacket )
/* Unpacks the 7bit variable encoding used in skeleton indexes */ /* Unpacks the 7bit variable encoding used in skeleton indexes */
unsigned const char * Read7BitsVariableLE( unsigned const char *p_begin, unsigned const char * Read7BitsVariableLE( unsigned const char *p_begin,
unsigned const char const *p_end, unsigned const char *p_end,
uint64_t *pi_value ) uint64_t *pi_value )
{ {
int i_shift = 0; int i_shift = 0;
...@@ -2642,7 +2642,7 @@ static void Ogg_ReadSkeletonIndex( demux_t *p_demux, ogg_packet *p_oggpacket ) ...@@ -2642,7 +2642,7 @@ static void Ogg_ReadSkeletonIndex( demux_t *p_demux, ogg_packet *p_oggpacket )
p_stream->p_skel->i_indexfirstnum = GetQWLE( &p_oggpacket->packet[24] ); p_stream->p_skel->i_indexfirstnum = GetQWLE( &p_oggpacket->packet[24] );
p_stream->p_skel->i_indexlastnum = GetQWLE( &p_oggpacket->packet[32] ); p_stream->p_skel->i_indexlastnum = GetQWLE( &p_oggpacket->packet[32] );
unsigned const char *p_fwdbyte = &p_oggpacket->packet[42]; unsigned const char *p_fwdbyte = &p_oggpacket->packet[42];
unsigned const char const *p_boundary = p_oggpacket->packet + p_oggpacket->bytes; unsigned const char *p_boundary = p_oggpacket->packet + p_oggpacket->bytes;
uint64_t i_offset = 0; uint64_t i_offset = 0;
uint64_t i_time = 0; uint64_t i_time = 0;
uint64_t i_keypoints_found = 0; uint64_t i_keypoints_found = 0;
......
...@@ -175,7 +175,7 @@ struct demux_sys_t ...@@ -175,7 +175,7 @@ struct demux_sys_t
unsigned const char * Read7BitsVariableLE( unsigned const char *, unsigned const char * Read7BitsVariableLE( unsigned const char *,
unsigned const char const *, unsigned const char *,
uint64_t * ); uint64_t * );
bool Ogg_GetBoundsUsingSkeletonIndex( logical_stream_t *p_stream, int64_t i_time, bool Ogg_GetBoundsUsingSkeletonIndex( logical_stream_t *p_stream, int64_t i_time,
int64_t *pi_lower, int64_t *pi_upper ); int64_t *pi_lower, int64_t *pi_upper );
...@@ -49,7 +49,7 @@ static const luaL_Reg p_reg[] = ...@@ -49,7 +49,7 @@ static const luaL_Reg p_reg[] =
* Extensions capabilities * Extensions capabilities
* Note: #define and ppsz_capabilities must be in sync * Note: #define and ppsz_capabilities must be in sync
*/ */
static const char const caps[][20] = { static const char caps[][20] = {
#define EXT_HAS_MENU (1 << 0) ///< Hook: menu #define EXT_HAS_MENU (1 << 0) ///< Hook: menu
"menu", "menu",
#define EXT_TRIGGER_ONLY (1 << 1) ///< Hook: trigger. Not activable #define EXT_TRIGGER_ONLY (1 << 1) ///< Hook: trigger. Not activable
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
/** /**
* The possible extensions for subtitle files we support * The possible extensions for subtitle files we support
*/ */
static const char const sub_exts[][6] = { static const char sub_exts[][6] = {
"idx", "sub", "srt", "idx", "sub", "srt",
"ssa", "ass", "smi", "ssa", "ass", "smi",
"utf", "utf8", "utf-8", "utf", "utf8", "utf-8",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment