virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

ffv1: const correctness for encode_rgb_frame()

Browse Source 
libavcodec/ffv1enc.c:922:53: warning: passing argument 5 of ‘encode_rgb_frame’ discards ‘const’ qualifier from pointer target type
This commit is contained in:
Diego Biurrun 2014-12-18 20:07:29 +01:00 committed by Vittorio Giovara
parent ca09effb01
commit 0352ff102d
1 changed files with 9 additions and 9 deletions

18
libavcodec/ffv1enc.c

@ -293,8 +293,8 @@ static void encode_plane(FFV1Context *s, uint8_t *src, int w, int h,
} }
} }
static void encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h, static void encode_rgb_frame(FFV1Context *s, const uint8_t *src[3],
int stride[3]) int w, int h, const int stride[3])
{ {
int x, y, p, i; int x, y, p, i;
const int ring_size = s->avctx->context_model ? 3 : 2; const int ring_size = s->avctx->context_model ? 3 : 2;
@ -320,15 +320,15 @@ static void encode_rgb_frame(FFV1Context *s, uint8_t *src[3], int w, int h,
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
int b, g, r, av_uninit(a); int b, g, r, av_uninit(a);
if (lbd) { if (lbd) {
unsigned v = *((uint32_t *)(src[0] + x * 4 + stride[0] * y)); unsigned v = *((const uint32_t *)(src[0] + x * 4 + stride[0] * y));
b = v & 0xFF; b = v & 0xFF;
g = (v >> 8) & 0xFF; g = (v >> 8) & 0xFF;
r = (v >> 16) & 0xFF; r = (v >> 16) & 0xFF;
a = v >> 24; a = v >> 24;
} else { } else {
b = *((uint16_t *)(src[0] + x * 2 + stride[0] * y)); b = *((const uint16_t *)(src[0] + x * 2 + stride[0] * y));
g = *((uint16_t *)(src[1] + x * 2 + stride[1] * y)); g = *((const uint16_t *)(src[1] + x * 2 + stride[1] * y));
r = *((uint16_t *)(src[2] + x * 2 + stride[2] * y)); r = *((const uint16_t *)(src[2] + x * 2 + stride[2] * y));
} }
b -= g; b -= g;
@ -916,9 +916,9 @@ static int encode_slice(AVCodecContext *c, void *arg)
encode_plane(fs, p->data[3] + ps * x + y * p->linesize[3], width, encode_plane(fs, p->data[3] + ps * x + y * p->linesize[3], width,
height, p->linesize[3], 2); height, p->linesize[3], 2);
} else { } else {
uint8_t *planes[3] = { p->data[0] + ps * x + y * p->linesize[0], const uint8_t *planes[3] = { p->data[0] + ps * x + y * p->linesize[0],
p->data[1] + ps * x + y * p->linesize[1], p->data[1] + ps * x + y * p->linesize[1],
p->data[2] + ps * x + y * p->linesize[2] }; p->data[2] + ps * x + y * p->linesize[2] };
encode_rgb_frame(fs, planes, width, height, p->linesize); encode_rgb_frame(fs, planes, width, height, p->linesize);
} }
emms_c(); emms_c();