Commit 373211d8 authored by Mans Rullgard's avatar Mans Rullgard

Remove extraneous semicolons

These semicolons cause invalid empty top-level declarations.
Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 0ebd4083
...@@ -2200,8 +2200,8 @@ static av_always_inline void hl_decode_mb_444_internal(H264Context *h, int simpl ...@@ -2200,8 +2200,8 @@ static av_always_inline void hl_decode_mb_444_internal(H264Context *h, int simpl
static void hl_decode_mb_simple_ ## bits(H264Context *h){ \ static void hl_decode_mb_simple_ ## bits(H264Context *h){ \
hl_decode_mb_internal(h, 1, sh); \ hl_decode_mb_internal(h, 1, sh); \
} }
hl_decode_mb_simple(0, 8); hl_decode_mb_simple(0, 8)
hl_decode_mb_simple(1, 16); hl_decode_mb_simple(1, 16)
/** /**
* Process a macroblock; this handles edge cases, such as interlacing. * Process a macroblock; this handles edge cases, such as interlacing.
......
...@@ -388,9 +388,9 @@ static void FUNCC(pred16x16_##n##_dc)(uint8_t *_src, int stride){\ ...@@ -388,9 +388,9 @@ static void FUNCC(pred16x16_##n##_dc)(uint8_t *_src, int stride){\
PREDICT_16x16_DC(PIXEL_SPLAT_X4(v));\ PREDICT_16x16_DC(PIXEL_SPLAT_X4(v));\
} }
PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1); PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1)
PRED16x16_X(128, (1<<(BIT_DEPTH-1))+0); PRED16x16_X(128, (1<<(BIT_DEPTH-1))+0)
PRED16x16_X(129, (1<<(BIT_DEPTH-1))+1); PRED16x16_X(129, (1<<(BIT_DEPTH-1))+1)
static inline void FUNCC(pred16x16_plane_compat)(uint8_t *_src, int _stride, const int svq3, const int rv40){ static inline void FUNCC(pred16x16_plane_compat)(uint8_t *_src, int _stride, const int svq3, const int rv40){
int i, j, k; int i, j, k;
...@@ -502,9 +502,9 @@ static void FUNCC(pred8x8_##n##_dc)(uint8_t *_src, int stride){\ ...@@ -502,9 +502,9 @@ static void FUNCC(pred8x8_##n##_dc)(uint8_t *_src, int stride){\
}\ }\
} }
PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1); PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1)
PRED8x8_X(128, (1<<(BIT_DEPTH-1))+0); PRED8x8_X(128, (1<<(BIT_DEPTH-1))+0)
PRED8x8_X(129, (1<<(BIT_DEPTH-1))+1); PRED8x8_X(129, (1<<(BIT_DEPTH-1))+1)
static void FUNCC(pred8x16_128_dc)(uint8_t *_src, int stride){ static void FUNCC(pred8x16_128_dc)(uint8_t *_src, int stride){
FUNCC(pred8x8_128_dc)(_src, stride); FUNCC(pred8x8_128_dc)(_src, stride);
......
...@@ -550,8 +550,8 @@ static av_always_inline int vc1_mspel_ ## DIR ## _filter_16bits(const TYPE *src, ...@@ -550,8 +550,8 @@ static av_always_inline int vc1_mspel_ ## DIR ## _filter_16bits(const TYPE *src,
return 0; /* should not occur */ \ return 0; /* should not occur */ \
} }
VC1_MSPEL_FILTER_16B(ver, uint8_t); VC1_MSPEL_FILTER_16B(ver, uint8_t)
VC1_MSPEL_FILTER_16B(hor, int16_t); VC1_MSPEL_FILTER_16B(hor, int16_t)
/** Filter used to interpolate fractional pel values /** Filter used to interpolate fractional pel values
......
...@@ -67,7 +67,7 @@ static const AVClass flavor ## _context_class = {\ ...@@ -67,7 +67,7 @@ static const AVClass flavor ## _context_class = {\
.item_name = av_default_item_name,\ .item_name = av_default_item_name,\
.option = options,\ .option = options,\
.version = LIBAVUTIL_VERSION_INT,\ .version = LIBAVUTIL_VERSION_INT,\
}; }
HTTP_CLASS(http); HTTP_CLASS(http);
HTTP_CLASS(https); HTTP_CLASS(https);
......
...@@ -1286,7 +1286,7 @@ static int mov_write_tapt_tag(AVIOContext *pb, MOVTrack *track) ...@@ -1286,7 +1286,7 @@ static int mov_write_tapt_tag(AVIOContext *pb, MOVTrack *track)
avio_wb32(pb, track->enc->height << 16); avio_wb32(pb, track->enc->height << 16);
return updateSize(pb, pos); return updateSize(pb, pos);
}; }
// This box seems important for the psp playback ... without it the movie seems to hang // This box seems important for the psp playback ... without it the movie seems to hang
static int mov_write_edts_tag(AVIOContext *pb, MOVTrack *track) static int mov_write_edts_tag(AVIOContext *pb, MOVTrack *track)
......
...@@ -310,8 +310,8 @@ void shuffle_bytes_##a##b##c##d(const uint8_t *src, uint8_t *dst, int src_size) ...@@ -310,8 +310,8 @@ void shuffle_bytes_##a##b##c##d(const uint8_t *src, uint8_t *dst, int src_size)
} \ } \
} }
DEFINE_SHUFFLE_BYTES(0, 3, 2, 1); DEFINE_SHUFFLE_BYTES(0, 3, 2, 1)
DEFINE_SHUFFLE_BYTES(1, 2, 3, 0); DEFINE_SHUFFLE_BYTES(1, 2, 3, 0)
DEFINE_SHUFFLE_BYTES(3, 0, 1, 2); DEFINE_SHUFFLE_BYTES(3, 0, 1, 2)
DEFINE_SHUFFLE_BYTES(3, 2, 1, 0); DEFINE_SHUFFLE_BYTES(3, 2, 1, 0)
This diff is collapsed.
...@@ -181,7 +181,7 @@ extern void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt( ...@@ -181,7 +181,7 @@ extern void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt(
SwsContext *c, int16_t *data, \ SwsContext *c, int16_t *data, \
int dstW, const uint8_t *src, \ int dstW, const uint8_t *src, \
const int16_t *filter, \ const int16_t *filter, \
const int16_t *filterPos, int filterSize); const int16_t *filterPos, int filterSize)
#define SCALE_FUNCS(filter_n, opt) \ #define SCALE_FUNCS(filter_n, opt) \
SCALE_FUNC(filter_n, 8, 15, opt); \ SCALE_FUNC(filter_n, 8, 15, opt); \
......
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