Skip to content

Commit b5e767a

Browse files
committed
Remove if 0
1 parent 703321e commit b5e767a

27 files changed

Lines changed: 275 additions & 599 deletions

File tree

gfx/include/ANGLE/KHR/khrplatform.h

Lines changed: 272 additions & 282 deletions
Large diffs are not rendered by default.

gfx/include/Cg/cgD3D9.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@
5959
#include "cg.h"
6060

6161
#include <d3d9.h>
62-
#if 0
63-
#ifdef HAVE_D3DX
64-
#include "../d3d9/d3dx9.h"
65-
#endif
66-
#endif
6762
#include <windows.h>
6863

6964
/* Set up for either Win32 import/export/lib. */

gfx/include/MESA/KHR/khrplatform.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -210,16 +210,6 @@ typedef unsigned long long int khronos_uint64_t;
210210
#define KHRONOS_SUPPORT_INT64 1
211211
#define KHRONOS_SUPPORT_FLOAT 1
212212

213-
#elif 0
214-
215-
/*
216-
* Hypothetical platform with no float or int64 support
217-
*/
218-
typedef int khronos_int32_t;
219-
typedef unsigned int khronos_uint32_t;
220-
#define KHRONOS_SUPPORT_INT64 0
221-
#define KHRONOS_SUPPORT_FLOAT 0
222-
223213
#else
224214

225215
/*

gfx/include/d3d9/d3dx9math.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1465,10 +1465,6 @@ HRESULT WINAPI D3DXSHProjectCubeMap
14651465
}
14661466
#endif
14671467

1468-
#if 0
1469-
#include "d3dx9math.inl"
1470-
#endif
1471-
14721468
#if _MSC_VER >= 1200
14731469
#pragma warning(pop)
14741470
#endif

gfx/include/dxsdk/dxgi.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,6 @@ typedef struct DXGI_ADAPTER_DESC
190190

191191
#if !defined(HMONITOR_DECLARED) && !defined(HMONITOR) && (WINVER < 0x0500)
192192
#define HMONITOR_DECLARED
193-
#if 0
194-
typedef HANDLE HMONITOR;
195-
196-
#endif
197193
DECLARE_HANDLE(HMONITOR);
198194
#endif
199195
typedef struct DXGI_OUTPUT_DESC

gfx/include/userland/containers/asf/asf_reader.c

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1683,49 +1683,6 @@ static VC_CONTAINER_STATUS_T asf_reader_index_find_time( VC_CONTAINER_T *p_ctx,
16831683
else return STREAM_STATUS(p_ctx);
16841684
}
16851685

1686-
#if 0
1687-
/*****************************************************************************/
1688-
static VC_CONTAINER_STATUS_T asf_reader_index_find_packet( VC_CONTAINER_T *p_ctx,
1689-
unsigned int track, uint32_t *packet_num, bool forward )
1690-
{
1691-
VC_CONTAINER_STATUS_T status;
1692-
VC_CONTAINER_MODULE_T *module = p_ctx->priv->module;
1693-
VC_CONTAINER_TRACK_MODULE_T *track_module = 0;
1694-
uint32_t i, prev_packet_num = 0, next_packet_num;
1695-
bool eos = false;
1696-
1697-
/* Sanity checking */
1698-
if(track >= p_ctx->tracks_num) return VC_CONTAINER_ERROR_FAILED;
1699-
track_module = p_ctx->tracks[track]->priv->module;
1700-
if(!track_module->num_index_entries) return VC_CONTAINER_ERROR_UNSUPPORTED_OPERATION;
1701-
if(!track_module->index_time_interval) return VC_CONTAINER_ERROR_CORRUPTED;
1702-
1703-
status = SEEK(p_ctx, track_module->index_offset);
1704-
if(status != VC_CONTAINER_SUCCESS) return status;
1705-
1706-
/* Loop through all the entries in the index */
1707-
for(i = 0; i < track_module->num_index_entries; i++)
1708-
{
1709-
next_packet_num = READ_U32(p_ctx, "Packet Number");
1710-
SKIP_U16(p_ctx, "Packet Count");
1711-
if(next_packet_num > *packet_num) break;
1712-
if(STREAM_STATUS(p_ctx) != VC_CONTAINER_SUCCESS) break;
1713-
prev_packet_num = next_packet_num;
1714-
}
1715-
if(i == track_module->num_index_entries ) eos = true;
1716-
1717-
if(STREAM_STATUS(p_ctx) == VC_CONTAINER_SUCCESS && !eos)
1718-
{
1719-
if(forward) *packet_num = next_packet_num;
1720-
else *packet_num = prev_packet_num;
1721-
}
1722-
1723-
if(eos && track_module->index_incomplete) return VC_CONTAINER_ERROR_INCOMPLETE_DATA;
1724-
else if(eos) return VC_CONTAINER_ERROR_EOS;
1725-
else return STREAM_STATUS(p_ctx);
1726-
}
1727-
#endif
1728-
17291686
/*****************************************************************************/
17301687
static VC_CONTAINER_STATUS_T asf_reader_find_next_frame( VC_CONTAINER_T *p_ctx,
17311688
unsigned int track, ASF_PACKET_STATE *p_state, bool keyframe, bool timeout )

gfx/include/userland/containers/asf/asf_writer.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@ static VC_CONTAINER_STATUS_T asf_write_object_ext_stream_properties( VC_CONTAINE
105105
static VC_CONTAINER_STATUS_T asf_write_object_simple_index( VC_CONTAINER_T *p_ctx );
106106
static VC_CONTAINER_STATUS_T asf_write_object_index( VC_CONTAINER_T *p_ctx );
107107
static VC_CONTAINER_STATUS_T asf_write_object_data( VC_CONTAINER_T *p_ctx );
108-
#if 0
109-
static VC_CONTAINER_STATUS_T asf_write_object_codec_list( VC_CONTAINER_T *p_ctx );
110-
static VC_CONTAINER_STATUS_T asf_write_object_content_description( VC_CONTAINER_T *p_ctx );
111-
static VC_CONTAINER_STATUS_T asf_write_object_stream_bitrate_props( VC_CONTAINER_T *p_ctx );
112-
#endif
113108

114109
static const GUID_T asf_guid_header = {0x75B22630, 0x668E, 0x11CF, {0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}};
115110
static const GUID_T asf_guid_file_props = {0x8CABDCA1, 0xA947, 0x11CF, {0x8E, 0xE4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}};
@@ -148,12 +143,6 @@ static struct {
148143
{ASF_OBJECT_TYPE_INDEX, &asf_guid_index, "index", asf_write_object_index},
149144
{ASF_OBJECT_TYPE_HEADER_EXT, &asf_guid_header_ext, "header extension", asf_write_object_header_ext},
150145
{ASF_OBJECT_TYPE_HEADER_EXT_INTERNAL, &asf_guid_header_ext, "header extension", asf_write_object_header_ext_internal},
151-
#if 0
152-
{ASF_OBJECT_TYPE_CODEC_LIST, &asf_guid_codec_list, "codec list", asf_write_object_codec_list},
153-
{ASF_OBJECT_TYPE_CONTENT_DESCRIPTION, &asf_guid_content_description, "content description", asf_write_object_content_description},
154-
{ASF_OBJECT_TYPE_EXT_CONTENT_DESCRIPTION, &asf_guid_ext_content_description, "extended content description", 0},
155-
{ASF_OBJECT_TYPE_STREAM_BITRATE_PROPS, &asf_guid_stream_bitrate_props, "stream bitrate properties", asf_write_object_stream_bitrate_props},
156-
#endif
157146
{ASF_OBJECT_TYPE_UNKNOWN, 0, "unknown", 0}
158147
};
159148

gfx/include/userland/containers/core/containers_codecs.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@ static struct {
5555
{VC_CONTAINER_CODEC_AC3, WAVE_FORMAT_ESST_AC3}, /**< AC-3 padded for S/PDIF */
5656
{VC_CONTAINER_CODEC_EAC3, WAVE_FORMAT_DVM},
5757
{VC_CONTAINER_CODEC_DTS, WAVE_FORMAT_DTS},
58-
#if 0
59-
{CODEC_G726, WAVE_FORMAT_G726_ADPCM},
60-
{CODEC_G726, WAVE_FORMAT_DF_G726},
61-
{CODEC_G726, WAVE_FORMAT_G726ADPCM},
62-
{CODEC_G726, WAVE_FORMAT_PANASONIC_G726},
63-
#endif
6458
{VC_CONTAINER_CODEC_MP4A, WAVE_FORMAT_AAC},
6559
{VC_CONTAINER_CODEC_MP4A, WAVE_FORMAT_MP4A},
6660
{VC_CONTAINER_CODEC_ATRAC3, WAVE_FORMAT_SONY_SCX},

gfx/include/userland/containers/mkv/matroska_reader.c

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -767,23 +767,6 @@ static VC_CONTAINER_FOURCC_T mkv_codecid_to_fourcc(const char *codecid,
767767
return codecid_to_fourcc_table[i].fourcc;
768768
}
769769

770-
#if 0
771-
/** Find the track associated with an MKV track number */
772-
static VC_CONTAINER_TRACK_T *mkv_reader_find_track( VC_CONTAINER_T *p_ctx, unsigned int mkv_track_num)
773-
{
774-
VC_CONTAINER_TRACK_T *p_track = 0;
775-
unsigned int i;
776-
777-
for(i = 0; i < p_ctx->tracks_num; i++)
778-
if(p_ctx->tracks[i]->priv->module->number == mkv_track_num) break;
779-
780-
if(i < p_ctx->tracks_num) /* We found it */
781-
p_track = p_ctx->tracks[i];
782-
783-
return p_track;
784-
}
785-
#endif
786-
787770
/** Base function used to read an MKV/EBML element header.
788771
* This will read the element header do lots of sanity checking and return the element id
789772
* and the size of the data contained in the element */
@@ -1700,10 +1683,6 @@ static VC_CONTAINER_STATUS_T mkv_find_next_element(VC_CONTAINER_T *p_ctx,
17001683
return VC_CONTAINER_ERROR_NOT_FOUND;
17011684

17021685
status = mkv_read_element_data(p_ctx, element, element_size, INT64_C(1) << 30);
1703-
#if 0
1704-
if(element_size < MKV_MAX_ELEMENT_SIZE) SKIP_BYTES(p_ctx, element_size);
1705-
else SEEK(p_ctx, STREAM_POSITION(p_ctx) + element_size);
1706-
#endif
17071686
} while (status == VC_CONTAINER_SUCCESS && STREAM_STATUS(p_ctx) == VC_CONTAINER_SUCCESS);
17081687

17091688
if(STREAM_STATUS(p_ctx) != VC_CONTAINER_SUCCESS)

gfx/include/userland/containers/mp4/mp4_reader.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -306,18 +306,12 @@ static VC_CONTAINER_STATUS_T mp4_read_box_header( VC_CONTAINER_T *p_ctx, int64_t
306306
return VC_CONTAINER_ERROR_CORRUPTED;
307307
}
308308

309-
#if 0
310-
/* It is valid for a box to have a zero size (i.e unknown) if it is the last one */
311-
if(*box_size == 0 && size >= 0) *box_size = size;
312-
else if(*box_size == 0) *box_size = INT64_C(-1);
313-
#else
314309
if(*box_size <= 0)
315310
{
316311
LOG_DEBUG(p_ctx, "box %4.4s has an invalid size (%"PRIi64")",
317312
(const char *)box_type, *box_size);
318313
return VC_CONTAINER_ERROR_CORRUPTED;
319314
}
320-
#endif
321315

322316
/* Sanity check box size against parent */
323317
if(size >= 0 && *box_size > size)

0 commit comments

Comments
 (0)