Skip to content

Commit

Permalink
Convert to struct init's from gcc specific to C99 versions (clang)
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-kristjansson committed Dec 10, 2012
1 parent 89fbfaa commit 4e3aecd
Show file tree
Hide file tree
Showing 18 changed files with 137 additions and 137 deletions.
20 changes: 10 additions & 10 deletions mythtv/filters/adjust/filter_adjust.c
Expand Up @@ -22,11 +22,11 @@
#include "ffmpeg-mmx.h"

static const mmx_t mm_cpool[] = {
{ w: {1, 1, 1, 1} },
{ ub: {36, 36, 36, 36, 36, 36, 36, 36} },
{ ub: {20, 20, 20, 20, 20, 20, 20, 20} },
{ ub: {31, 31, 31, 31, 31, 31, 31, 31} },
{ ub: {15, 15, 15, 15, 15, 15, 15, 15} }
{ .w = {1, 1, 1, 1} },
{ .ub= {36, 36, 36, 36, 36, 36, 36, 36} },
{ .ub= {20, 20, 20, 20, 20, 20, 20, 20} },
{ .ub= {31, 31, 31, 31, 31, 31, 31, 31} },
{ .ub= {15, 15, 15, 15, 15, 15, 15, 15} }
};

#endif /* HAVE_MMX */
Expand Down Expand Up @@ -315,11 +315,11 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &newAdjustFilter,
name: (char*)"adjust",
descript: (char*)"adjust range and gamma of video",
formats: FmtList,
libname: NULL
.filter_init= &newAdjustFilter,
.name= (char*)"adjust",
.descript= (char*)"adjust range and gamma of video",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/bobdeint/filter_bobdeint.c
Expand Up @@ -143,13 +143,13 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"bobdeint",
descript: (char*)
.filter_init= &new_filter,
.name= (char*)"bobdeint",
.descript= (char*)
"bob deinterlace filter; "
"splits fields to top and bottom of buffer",
formats: FmtList,
libname: NULL,
.formats= FmtList,
.libname= NULL,
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/convert/filter_convert.c
Expand Up @@ -159,11 +159,11 @@ static FmtConv FmtList[] =
FilterInfo filter_table[] =
{
{
filter_init: &newConvertFilter,
name: "convert",
descript: "converts between various video types",
formats: FmtList,
libname: NULL
.filter_init= &newConvertFilter,
.name= "convert",
.descript= "converts between various video types",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
Expand Down
10 changes: 5 additions & 5 deletions mythtv/filters/crop/filter_crop.c
Expand Up @@ -303,11 +303,11 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"crop",
descript: (char*)"crops picture by macroblock intervals",
formats: FmtList,
libname: NULL
.filter_init= &new_filter,
.name= (char*)"crop",
.descript= (char*)"crops picture by macroblock intervals",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/denoise3d/filter_denoise3d.c
Expand Up @@ -474,12 +474,12 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &NewDenoise3DFilter,
name: (char*)"denoise3d",
descript: (char*)
.filter_init= &NewDenoise3DFilter,
.name= (char*)"denoise3d",
.descript= (char*)
"removes noise with a spatial and temporal low-pass filter",
formats: FmtList,
libname: NULL
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/fieldorder/filter_fieldorder.c
Expand Up @@ -229,12 +229,12 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &FieldorderDeintFilter,
name: (char*)"fieldorderdoubleprocessdeint",
descript: (char*)"avoids synchronisation problems when matching an "
.filter_init= &FieldorderDeintFilter,
.name= (char*)"fieldorderdoubleprocessdeint",
.descript= (char*)"avoids synchronisation problems when matching an "
"interlaced video mode to an interlaced source",
formats: FmtList,
libname: NULL
.formats= FmtList,
.libname= NULL
}, FILT_NULL
};

Expand Down
40 changes: 20 additions & 20 deletions mythtv/filters/force/filter_force.c
Expand Up @@ -98,32 +98,32 @@ static FmtConv Fmt_List_ARGB32[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_force_yv12,
name: (char*)"forceyv12",
descript: (char*)"forces use of YV12 video format",
formats: Fmt_List_YV12,
libname: NULL
.filter_init= &new_force_yv12,
.name= (char*)"forceyv12",
.descript= (char*)"forces use of YV12 video format",
.formats= Fmt_List_YV12,
.libname= NULL
},
{
filter_init: &new_force_yuv422p,
name: (char*)"forceyuv422p",
descript: (char*)"forces use of YUV422P video format",
formats: Fmt_List_YUV422P,
libname: NULL
.filter_init= &new_force_yuv422p,
.name= (char*)"forceyuv422p",
.descript= (char*)"forces use of YUV422P video format",
.formats= Fmt_List_YUV422P,
.libname= NULL
},
{
filter_init: &new_force_rgb24,
name: (char*)"forcergb24",
descript: (char*)"forces use of RGB24 video format",
formats: Fmt_List_RGB24,
libname: NULL
.filter_init= &new_force_rgb24,
.name= (char*)"forcergb24",
.descript= (char*)"forces use of RGB24 video format",
.formats= Fmt_List_RGB24,
.libname= NULL
},
{
filter_init: &new_force_argb32,
name: (char*)"forceargb32",
descript: (char*)"forces use of ARGB32 video format",
formats: Fmt_List_ARGB32,
libname: NULL
.filter_init= &new_force_argb32,
.name= (char*)"forceargb32",
.descript= (char*)"forces use of ARGB32 video format",
.formats= Fmt_List_ARGB32,
.libname= NULL
},
FILT_NULL
};
20 changes: 10 additions & 10 deletions mythtv/filters/greedyhdeint/filter_greedyhdeint.c
Expand Up @@ -276,18 +276,18 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &GreedyHDeintFilter,
name: (char*)"greedyhdeint",
descript: (char*)"combines data from several fields to deinterlace with less motion blur",
formats: FmtList,
libname: NULL
.filter_init= &GreedyHDeintFilter,
.name= (char*)"greedyhdeint",
.descript= (char*)"combines data from several fields to deinterlace with less motion blur",
.formats= FmtList,
.libname= NULL
},
{
filter_init: &GreedyHDeintFilter,
name: (char*)"greedyhdoubleprocessdeint",
descript: (char*)"combines data from several fields to deinterlace with less motion blur",
formats: FmtList,
libname: NULL
.filter_init= &GreedyHDeintFilter,
.name= (char*)"greedyhdoubleprocessdeint",
.descript= (char*)"combines data from several fields to deinterlace with less motion blur",
.formats= FmtList,
.libname= NULL
},FILT_NULL
};

Expand Down
10 changes: 5 additions & 5 deletions mythtv/filters/invert/filter_invert.c
Expand Up @@ -79,11 +79,11 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"invert",
descript: (char*)"inverts the colors of the input video",
formats: FmtList,
libname: NULL
.filter_init= &new_filter,
.name= (char*)"invert",
.descript= (char*)"inverts the colors of the input video",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/ivtc/filter_ivtc.c
Expand Up @@ -252,11 +252,11 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &NewIvtcFilter,
name: (char*)"ivtc",
descript: (char*)"inverse telecine filter",
formats: FmtList,
libname: NULL
.filter_init= &NewIvtcFilter,
.name= (char*)"ivtc",
.descript= (char*)"inverse telecine filter",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
Expand Down
24 changes: 12 additions & 12 deletions mythtv/filters/kerneldeint/filter_kerneldeint.c
Expand Up @@ -27,9 +27,9 @@
#if HAVE_MMX
#include "ffmpeg-mmx.h"
#define THRESHOLD 12
static const mmx_t mm_lthr = { w:{ -THRESHOLD, -THRESHOLD,
static const mmx_t mm_lthr = { .w={ -THRESHOLD, -THRESHOLD,
-THRESHOLD, -THRESHOLD} };
static const mmx_t mm_hthr = { w:{ THRESHOLD - 1, THRESHOLD - 1,
static const mmx_t mm_hthr = { .w={ THRESHOLD - 1, THRESHOLD - 1,
THRESHOLD - 1, THRESHOLD - 1} };
static const mmx_t mm_cpool[] = { { 0x0000000000000000LL }, };
#else
Expand Down Expand Up @@ -664,20 +664,20 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &NewKernelDeintFilter,
name: (char*)"kerneldeint",
descript: (char*)"combines data from several fields to deinterlace "
.filter_init= &NewKernelDeintFilter,
.name= (char*)"kerneldeint",
.descript= (char*)"combines data from several fields to deinterlace "
"with less motion blur",
formats: FmtList,
libname: NULL
.formats= FmtList,
.libname= NULL
},
{
filter_init: &NewKernelDeintFilter,
name: (char*)"kerneldoubleprocessdeint",
descript: (char*)"combines data from several fields to deinterlace "
.filter_init= &NewKernelDeintFilter,
.name= (char*)"kerneldoubleprocessdeint",
.descript= (char*)"combines data from several fields to deinterlace "
"with less motion blur",
formats: FmtList,
libname: NULL
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/linearblend/filter_linearblend.c
Expand Up @@ -378,11 +378,11 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"linearblend",
descript: (char*)"fast blending deinterlace filter",
formats: FmtList,
libname: NULL
.filter_init= &new_filter,
.name= (char*)"linearblend",
.descript= (char*)"fast blending deinterlace filter",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/onefield/filter_onefield.c
Expand Up @@ -97,13 +97,13 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"onefield",
descript: (char*)
.filter_init= &new_filter,
.name= (char*)"onefield",
.descript= (char*)
"one-field-only deinterlace filter; "
"parameter \"bottom\" for bottom field, otherwise top",
formats: FmtList,
libname: NULL,
.formats= FmtList,
.libname= NULL,
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/postprocess/filter_postprocess.c
Expand Up @@ -136,11 +136,11 @@ FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"postprocess",
descript: (char*)"FFMPEG's postprocessing filters",
formats: FmtList,
libname: NULL
.filter_init= &new_filter,
.name= (char*)"postprocess",
.descript= (char*)"FFMPEG's postprocessing filters",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/quickdnr/filter_quickdnr.c
Expand Up @@ -590,12 +590,12 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"quickdnr",
descript: (char*)
.filter_init= &new_filter,
.name= (char*)"quickdnr",
.descript= (char*)
"removes noise with a fast single/double thresholded average filter",
formats: FmtList,
libname: NULL
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};
10 changes: 5 additions & 5 deletions mythtv/filters/vflip/filter_vflip.c
Expand Up @@ -143,11 +143,11 @@ static FmtConv FmtList[] =
const FilterInfo filter_table[] =
{
{
filter_init: &new_filter,
name: (char*)"vflip",
descript: (char*)"flips the video image vertically",
formats: FmtList,
libname: NULL
.filter_init= &new_filter,
.name= (char*)"vflip",
.descript= (char*)"flips the video image vertically",
.formats= FmtList,
.libname= NULL
},
FILT_NULL
};

0 comments on commit 4e3aecd

Please sign in to comment.