@@ -46,15 +46,13 @@ enum CFHDParam {
SubbandNumber = 48,
Quantization = 53,
ChannelNumber = 62,
+ Progressive = 68,
BitsPerComponent = 101,
ChannelWidth = 104,
ChannelHeight = 105,
PrescaleShift = 109,
- Progressive = 68,
};
-
-
static av_cold int cfhd_init(AVCodecContext *avctx)
{
CFHDContext *s = avctx->priv_data;
@@ -145,17 +143,15 @@ static inline void interlaced_vertical_filter(int16_t
*output, int16_t *low, int
int width, int linesize, int plane)
{
int i;
- int16_t even, odd;
+ int even, odd;
for (i = 0; i < width; i++) {
-
-
even = (*low - *high)/2;
odd = (*low + *high)/2;
- if (even > 1023) even = 1023;
- if (even < 0) even = 0;
- if (odd > 1023) odd = 1023;
- if (odd < 0) odd = 0;
+ even = FFMIN(even, 1023);
+ even = FFMAX(even, 0);
+ odd = FFMIN(odd, 1023);
+ odd = FFMAX(odd, 0);
output[i] = even;