aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dnxhdenc.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:35:03 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-17 19:35:03 +0100
commit9d4799c247e305ab480198e4942d229a2949ea9b (patch)
tree578dda879d68c9a03a5969bfd1c4e8334144e336 /libavcodec/dnxhdenc.c
parent61400a1dc751c82cf6f33a7510c3804b7b201f25 (diff)
parent8dead2aaca4aa8b84b77b05745755afb56b7d37a (diff)
downloadffmpeg-9d4799c247e305ab480198e4942d229a2949ea9b.tar.gz
Merge commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a'
* commit '8dead2aaca4aa8b84b77b05745755afb56b7d37a': Move const qualifier before type name Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/dnxhdenc.c')
-rw-r--r--libavcodec/dnxhdenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index e2ebeeb4e9..4f706b6b86 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -761,7 +761,7 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg,
ctx->mb_cmp[mb].mb = mb;
}
} else { // 10-bit
- int const linesize = ctx->m.linesize >> 1;
+ const int linesize = ctx->m.linesize >> 1;
for (mb_x = 0; mb_x < ctx->m.mb_width; ++mb_x) {
uint16_t *pix = (uint16_t *)ctx->thread[0]->src[0] +
((mb_y << 4) * linesize) + (mb_x << 4);
@@ -776,7 +776,7 @@ static int dnxhd_mb_var_thread(AVCodecContext *avctx, void *arg,
for (i = 0; i < bh; ++i) {
for (j = 0; j < bw; ++j) {
// Turn 16-bit pixels into 10-bit ones.
- int const sample = (unsigned) pix[j] >> 6;
+ const int sample = (unsigned) pix[j] >> 6;
sum += sample;
sqsum += sample * sample;
// 2^10 * 2^10 * 16 * 16 = 2^28, which is less than INT_MAX