virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

Browse Source 
* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
  xl: K&R formatting cosmetics

Conflicts:
	libavcodec/xl.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-29 11:08:02 +02:00
commit 688331c51c
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libavcodec/xl.c
View File

@ -41,8 +41,8 @@ static int decode_frame(AVCodecContext *avctx,
AVPacket *avpkt)
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
AVFrame * const p = data;
int buf_size = avpkt->size;
AVFrame *const p = data;
uint8_t *Y, *U, *V;
int i, j, ret;
int stride;
@ -76,27 +76,27 @@ static int decode_frame(AVCodecContext *avctx,
for (j = 0; j < avctx->width; j += 4) {
/* value is stored in LE dword with word swapped */
val = AV_RL32(buf);
val = AV_RL32(buf);
buf -= 4;
val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
if(!j)
if (!j)
y0 = (val & 0x1F) << 2;
else
y0 = y3 + xl_table[val & 0x1F];
val >>= 5;
y1 = y0 + xl_table[val & 0x1F];
y1 = y0 + xl_table[val & 0x1F];
val >>= 5;
y2 = y1 + xl_table[val & 0x1F];
y2 = y1 + xl_table[val & 0x1F];
val >>= 6; /* align to word */
y3 = y2 + xl_table[val & 0x1F];
y3 = y2 + xl_table[val & 0x1F];
val >>= 5;
if(!j)
if (!j)
c0 = (val & 0x1F) << 2;
else
c0 += xl_table[val & 0x1F];
val >>= 5;
if(!j)
if (!j)
c1 = (val & 0x1F) << 2;
else
c1 += xl_table[val & 0x1F];
@ -111,9 +111,9 @@ static int decode_frame(AVCodecContext *avctx,
}
buf += avctx->width + 4;
Y += p->linesize[0];
U += p->linesize[1];
V += p->linesize[2];
Y += p->linesize[0];
U += p->linesize[1];
V += p->linesize[2];
}
*got_frame = 1;
@ -129,11 +129,11 @@ static av_cold int decode_init(AVCodecContext *avctx)
}
AVCodec ff_xl_decoder = {
.name = "xl",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VIXL,
.init = decode_init,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
.name = "xl",
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VIXL,
.init = decode_init,
.decode = decode_frame,
.capabilities = CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),
};