Improves readability.
Showing the changes to libavfilter (1 of 1 file). Show all
Unified · Split
| @@ -233,19 +233,20 @@ static void horizontal_frame_pack(AVFilterLink *outlink, · 232 unmodified lines | |||
| 233 | } | 233 | } |
| 234 | } else { | 234 | } else { |
| 235 | for (i = 0; i < 2; i++) { | 235 | for (i = 0; i < 2; i++) { |
| 236 | const AVFrame *const input_view = s->input_views[i]; | ||
| 236 | const int psize = 1 + (s->depth > 8); | 237 | const int psize = 1 + (s->depth > 8); |
| 237 | uint8_t *dst[4]; | 238 | uint8_t *dst[4]; |
| 238 | int sub_w = psize * s->input_views[i]->width >> s->pix_desc->log2_chroma_w; | 239 | int sub_w = psize * input_view->width >> s->pix_desc->log2_chroma_w; |
| 239 | 240 | ||
| 240 | dst[0] = out->data[0] + i * s->input_views[i]->width * psize; | 241 | dst[0] = out->data[0] + i * input_view->width * psize; |
| 241 | dst[1] = out->data[1] + i * sub_w; | 242 | dst[1] = out->data[1] + i * sub_w; |
| 242 | dst[2] = out->data[2] + i * sub_w; | 243 | dst[2] = out->data[2] + i * sub_w; |
| 243 | 244 | ||
| 244 | av_image_copy2(dst, out->linesize, | 245 | av_image_copy2(dst, out->linesize, |
| 245 | s->input_views[i]->data, s->input_views[i]->linesize, | 246 | input_view->data, input_view->linesize, |
| 246 | s->input_views[i]->format, | 247 | input_view->format, |
| 247 | s->input_views[i]->width, | 248 | input_view->width, |
| 248 | s->input_views[i]->height); | 249 | input_view->height); |
| 249 | } | 250 | } |
| 250 | } | 251 | } |
| 251 | } | 252 | } |
| @@ -259,12 +260,13 @@ static void vertical_frame_pack(AVFilterLink *outlink, · 7 unmodified lines | |||
| 259 | int i; | 260 | int i; |
| 260 | 261 | ||
| 261 | for (i = 0; i < 2; i++) { | 262 | for (i = 0; i < 2; i++) { |
| 263 | const AVFrame *const input_view = s->input_views[i]; | ||
| 262 | uint8_t *dst[4]; | 264 | uint8_t *dst[4]; |
| 263 | int linesizes[4]; | 265 | int linesizes[4]; |
| 264 | int sub_h = s->input_views[i]->height >> s->pix_desc->log2_chroma_h; | 266 | int sub_h = input_view->height >> s->pix_desc->log2_chroma_h; |
| 265 | 267 | ||
| 266 | dst[0] = out->data[0] + i * out->linesize[0] * | 268 | dst[0] = out->data[0] + i * out->linesize[0] * |
| 267 | (interleaved + s->input_views[i]->height * (1 - interleaved)); | 269 | (interleaved + input_view->height * (1 - interleaved)); |
| 268 | dst[1] = out->data[1] + i * out->linesize[1] * | 270 | dst[1] = out->data[1] + i * out->linesize[1] * |
| 269 | (interleaved + sub_h * (1 - interleaved)); | 271 | (interleaved + sub_h * (1 - interleaved)); |
| 270 | dst[2] = out->data[2] + i * out->linesize[2] * | 272 | dst[2] = out->data[2] + i * out->linesize[2] * |
| @@ -278,10 +280,10 @@ static void vertical_frame_pack(AVFilterLink *outlink, · 7 unmodified lines | |||
| 278 | interleaved * out->linesize[2]; | 280 | interleaved * out->linesize[2]; |
| 279 | 281 | ||
| 280 | av_image_copy2(dst, linesizes, | 282 | av_image_copy2(dst, linesizes, |
| 281 | s->input_views[i]->data, s->input_views[i]->linesize, | 283 | input_view->data, input_view->linesize, |
| 282 | s->input_views[i]->format, | 284 | input_view->format, |
| 283 | s->input_views[i]->width, | 285 | input_view->width, |
| 284 | s->input_views[i]->height); | 286 | input_view->height); |
| 285 | } | 287 | } |
| 286 | } | 288 | } |
| 287 | 289 | ||