diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-03-03 17:20:31 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-07-25 13:56:59 +0200 |
| commit | 52a21fabc3bfd6f2d7426ca21f6c7281fe2cc312 (patch) | |
| tree | aca81b666a83aeaee24c9f71391da07081a89864 | |
| parent | 3d1a9c6c3b6ce6a1667e665a22011fe8b1e9879b (diff) | |
cfhd: consistency cosmetics
This slightly simplifies the next refactoring step.
| -rw-r--r-- | libavcodec/cfhd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index b722822006..807d7d83fa 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -658,12 +658,13 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, planes = av_pix_fmt_count_planes(avctx->pix_fmt); for (plane = 0; plane < planes; plane++) { + int act_plane = plane == 1 ? 2 : plane == 2 ? 1 : plane; + int16_t *low, *high, *output, *dst; + /* level 1 */ int lowpass_height = s->plane[plane].band[0][0].height; int lowpass_width = s->plane[plane].band[0][0].width; ptrdiff_t highpass_stride = s->plane[plane].band[0][1].stride; - int act_plane = plane == 1 ? 2 : plane == 2 ? 1 : plane; - int16_t *low, *high, *output, *dst; if (lowpass_height > s->plane[plane].band[0][0].a_height || lowpass_width > s->plane[plane].band[0][0].a_width || @@ -673,8 +674,8 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, return AVERROR_INVALIDDATA; } - av_log(avctx, AV_LOG_DEBUG, "Decoding level 1 plane %i %i %i %ti\n", - plane, lowpass_height, lowpass_width, highpass_stride); + av_log(avctx, AV_LOG_DEBUG, "Level 1 plane %i %i %i %ti\n", plane, + lowpass_height, lowpass_width, highpass_stride); low = s->plane[plane].subband[0]; high = s->plane[plane].subband[2]; |