From 4e3aecd107d235b72e7796614da6bf78310f68ce Mon Sep 17 00:00:00 2001 From: Daniel Thor Kristjansson Date: Mon, 10 Dec 2012 17:14:35 -0500 Subject: [PATCH] Convert to struct init's from gcc specific to C99 versions (clang) --- mythtv/filters/adjust/filter_adjust.c | 20 +++++----- mythtv/filters/bobdeint/filter_bobdeint.c | 10 ++--- mythtv/filters/convert/filter_convert.c | 10 ++--- mythtv/filters/crop/filter_crop.c | 10 ++--- mythtv/filters/denoise3d/filter_denoise3d.c | 10 ++--- mythtv/filters/fieldorder/filter_fieldorder.c | 10 ++--- mythtv/filters/force/filter_force.c | 40 +++++++++---------- .../greedyhdeint/filter_greedyhdeint.c | 20 +++++----- mythtv/filters/invert/filter_invert.c | 10 ++--- mythtv/filters/ivtc/filter_ivtc.c | 10 ++--- .../filters/kerneldeint/filter_kerneldeint.c | 24 +++++------ .../filters/linearblend/filter_linearblend.c | 10 ++--- mythtv/filters/onefield/filter_onefield.c | 10 ++--- .../filters/postprocess/filter_postprocess.c | 10 ++--- mythtv/filters/quickdnr/filter_quickdnr.c | 10 ++--- mythtv/filters/vflip/filter_vflip.c | 10 ++--- mythtv/filters/yadif/filter_yadif.c | 20 +++++----- mythtv/libs/libmythtv/blend.c | 30 +++++++------- 18 files changed, 137 insertions(+), 137 deletions(-) diff --git a/mythtv/filters/adjust/filter_adjust.c b/mythtv/filters/adjust/filter_adjust.c index 0a20f1840fd..63f0ab0d7ed 100644 --- a/mythtv/filters/adjust/filter_adjust.c +++ b/mythtv/filters/adjust/filter_adjust.c @@ -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 */ @@ -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 }; diff --git a/mythtv/filters/bobdeint/filter_bobdeint.c b/mythtv/filters/bobdeint/filter_bobdeint.c index a91b757d957..a06de1cd514 100644 --- a/mythtv/filters/bobdeint/filter_bobdeint.c +++ b/mythtv/filters/bobdeint/filter_bobdeint.c @@ -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 }; diff --git a/mythtv/filters/convert/filter_convert.c b/mythtv/filters/convert/filter_convert.c index e9877249821..bf2f5796868 100644 --- a/mythtv/filters/convert/filter_convert.c +++ b/mythtv/filters/convert/filter_convert.c @@ -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 }; diff --git a/mythtv/filters/crop/filter_crop.c b/mythtv/filters/crop/filter_crop.c index 24db907568e..491ee531919 100644 --- a/mythtv/filters/crop/filter_crop.c +++ b/mythtv/filters/crop/filter_crop.c @@ -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 }; diff --git a/mythtv/filters/denoise3d/filter_denoise3d.c b/mythtv/filters/denoise3d/filter_denoise3d.c index b7cd0da40b3..108874a5b1b 100644 --- a/mythtv/filters/denoise3d/filter_denoise3d.c +++ b/mythtv/filters/denoise3d/filter_denoise3d.c @@ -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 }; diff --git a/mythtv/filters/fieldorder/filter_fieldorder.c b/mythtv/filters/fieldorder/filter_fieldorder.c index c1fb231ccea..db0d8fc501c 100644 --- a/mythtv/filters/fieldorder/filter_fieldorder.c +++ b/mythtv/filters/fieldorder/filter_fieldorder.c @@ -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 }; diff --git a/mythtv/filters/force/filter_force.c b/mythtv/filters/force/filter_force.c index d3dd1fc571c..22695ce819c 100644 --- a/mythtv/filters/force/filter_force.c +++ b/mythtv/filters/force/filter_force.c @@ -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 }; diff --git a/mythtv/filters/greedyhdeint/filter_greedyhdeint.c b/mythtv/filters/greedyhdeint/filter_greedyhdeint.c index ba119ec844f..ff28eccb71f 100644 --- a/mythtv/filters/greedyhdeint/filter_greedyhdeint.c +++ b/mythtv/filters/greedyhdeint/filter_greedyhdeint.c @@ -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 }; diff --git a/mythtv/filters/invert/filter_invert.c b/mythtv/filters/invert/filter_invert.c index 5a2674ff3e5..c2550c86a59 100644 --- a/mythtv/filters/invert/filter_invert.c +++ b/mythtv/filters/invert/filter_invert.c @@ -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 }; diff --git a/mythtv/filters/ivtc/filter_ivtc.c b/mythtv/filters/ivtc/filter_ivtc.c index 8df3e2757eb..d2ee5284179 100644 --- a/mythtv/filters/ivtc/filter_ivtc.c +++ b/mythtv/filters/ivtc/filter_ivtc.c @@ -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 }; diff --git a/mythtv/filters/kerneldeint/filter_kerneldeint.c b/mythtv/filters/kerneldeint/filter_kerneldeint.c index f6244cff369..f4bf00f125b 100644 --- a/mythtv/filters/kerneldeint/filter_kerneldeint.c +++ b/mythtv/filters/kerneldeint/filter_kerneldeint.c @@ -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 @@ -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 }; diff --git a/mythtv/filters/linearblend/filter_linearblend.c b/mythtv/filters/linearblend/filter_linearblend.c index 298fb4a35e1..55e9de0220a 100644 --- a/mythtv/filters/linearblend/filter_linearblend.c +++ b/mythtv/filters/linearblend/filter_linearblend.c @@ -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 }; diff --git a/mythtv/filters/onefield/filter_onefield.c b/mythtv/filters/onefield/filter_onefield.c index 36bbdd6d783..92930ea4287 100644 --- a/mythtv/filters/onefield/filter_onefield.c +++ b/mythtv/filters/onefield/filter_onefield.c @@ -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 }; diff --git a/mythtv/filters/postprocess/filter_postprocess.c b/mythtv/filters/postprocess/filter_postprocess.c index e914776edd5..fed38bd5711 100644 --- a/mythtv/filters/postprocess/filter_postprocess.c +++ b/mythtv/filters/postprocess/filter_postprocess.c @@ -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 }; diff --git a/mythtv/filters/quickdnr/filter_quickdnr.c b/mythtv/filters/quickdnr/filter_quickdnr.c index c11576394f9..da4b5b28752 100644 --- a/mythtv/filters/quickdnr/filter_quickdnr.c +++ b/mythtv/filters/quickdnr/filter_quickdnr.c @@ -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 }; diff --git a/mythtv/filters/vflip/filter_vflip.c b/mythtv/filters/vflip/filter_vflip.c index 4408ab72075..23f182d1e47 100644 --- a/mythtv/filters/vflip/filter_vflip.c +++ b/mythtv/filters/vflip/filter_vflip.c @@ -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 }; diff --git a/mythtv/filters/yadif/filter_yadif.c b/mythtv/filters/yadif/filter_yadif.c index 235e05c9f05..92be06a4016 100644 --- a/mythtv/filters/yadif/filter_yadif.c +++ b/mythtv/filters/yadif/filter_yadif.c @@ -723,22 +723,22 @@ static FmtConv FmtList[] = const FilterInfo filter_table[] = { { - filter_init: &YadifDeintFilter, - name: (char*)"yadifdeint", - descript: (char*) + .filter_init= &YadifDeintFilter, + .name= (char*)"yadifdeint", + .descript= (char*) "combines data from several fields to " "deinterlace with less motion blur", - formats: FmtList, - libname: NULL + .formats= FmtList, + .libname= NULL }, { - filter_init: &YadifDeintFilter, - name: (char*)"yadifdoubleprocessdeint", - descript: (char*) + .filter_init= &YadifDeintFilter, + .name= (char*)"yadifdoubleprocessdeint", + .descript= (char*) "combines data from several fields to " "deinterlace with less motion blur", - formats: FmtList, - libname: NULL + .formats= FmtList, + .libname= NULL }, FILT_NULL }; diff --git a/mythtv/libs/libmythtv/blend.c b/mythtv/libs/libmythtv/blend.c index faf2fd4932b..53dd5766626 100644 --- a/mythtv/libs/libmythtv/blend.c +++ b/mythtv/libs/libmythtv/blend.c @@ -6,11 +6,11 @@ static const mmx_t mm_cpool[] = { - { uw: {128, 128, 128, 128} }, - { uw: {255, 255, 255, 255} }, - { uw: {514, 514, 514, 514} }, - { uw: {1, 1, 1, 1} }, - { uw: {257, 257, 257, 257} } + { .uw = {128, 128, 128, 128} }, + { .uw = {255, 255, 255, 255} }, + { .uw = {514, 514, 514, 514} }, + { .uw = {1, 1, 1, 1} }, + { .uw = {257, 257, 257, 257} } }; void blendregion_mmx (uint8_t * ysrc, uint8_t * usrc, uint8_t * vsrc, @@ -245,7 +245,7 @@ void blendcolumn2_mmx (uint8_t * ysrc1, uint8_t * usrc1, uint8_t * vsrc1, int16_t rec_lut[256], uint8_t pow_lut[256][256]) { int x, y, i, alpha, newalpha; - mmx_t amod = { uw: {alphamod, alphamod, alphamod, alphamod} }; + mmx_t amod = { .uw = {alphamod, alphamod, alphamod, alphamod} }; mmx_t maskm; mmx_t ysrc1m; mmx_t uvsrc1m; @@ -564,10 +564,10 @@ void blendcolor_mmx (uint8_t ysrc, uint8_t usrc, uint8_t vsrc, int16_t rec_lut[256], uint8_t pow_lut[256][256]) { int x, y, i, alpha, newalpha; - mmx_t amod = { uw: {alphamod, alphamod, alphamod, alphamod} }; - mmx_t ysrcm = { uw: {ysrc, ysrc, ysrc, ysrc} }; - mmx_t usrcm = { uw: {usrc, usrc, usrc, usrc} }; - mmx_t vsrcm = { uw: {vsrc, vsrc, vsrc, vsrc} }; + mmx_t amod = { .uw = {alphamod, alphamod, alphamod, alphamod} }; + mmx_t ysrcm = { .uw = {ysrc, ysrc, ysrc, ysrc} }; + mmx_t usrcm = { .uw = {usrc, usrc, usrc, usrc} }; + mmx_t vsrcm = { .uw = {vsrc, vsrc, vsrc, vsrc} }; int16_t wbuf[8]; (void) pow_lut; @@ -780,10 +780,10 @@ void blendconst_mmx (uint8_t ysrc, uint8_t usrc, uint8_t vsrc, int16_t rec_lut[256], uint8_t pow_lut[256][256]) { int x, y, i, alpha, newalpha; - mmx_t ysrcm = { uw: {ysrc, ysrc, ysrc, ysrc} }; - mmx_t usrcm = { uw: {usrc, usrc, usrc, usrc} }; - mmx_t vsrcm = { uw: {vsrc, vsrc, vsrc, vsrc} }; - mmx_t asrcm = { uw: {asrc, asrc, asrc, asrc} }; + mmx_t ysrcm = { .uw = {ysrc, ysrc, ysrc, ysrc} }; + mmx_t usrcm = { .uw = {usrc, usrc, usrc, usrc} }; + mmx_t vsrcm = { .uw = {vsrc, vsrc, vsrc, vsrc} }; + mmx_t asrcm = { .uw = {asrc, asrc, asrc, asrc} }; int16_t wbuf[8]; (void) pow_lut; @@ -983,7 +983,7 @@ void blendcolumn_mmx (uint8_t * ysrc, uint8_t * usrc, uint8_t * vsrc, int16_t rec_lut[256], uint8_t pow_lut[256][256]) { int x, y, i, alpha, newalpha; - mmx_t amod = { uw: {alphamod, alphamod, alphamod, alphamod} }; + mmx_t amod = { .uw = {alphamod, alphamod, alphamod, alphamod} }; mmx_t ysrcm; mmx_t usrcm; mmx_t vsrcm;