virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +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
parent 19da86f3ff e13a929314
commit 688331c51c
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/xl.c
View File

@@ -42,7 +42,7 @@ static int decode_frame(AVCodecContext *avctx,
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
AVFrame * const p = data; AVFrame *const p = data;
uint8_t *Y, *U, *V; uint8_t *Y, *U, *V;
int i, j, ret; int i, j, ret;
int stride; int stride;
@@ -80,7 +80,7 @@ static int decode_frame(AVCodecContext *avctx,
buf -= 4; buf -= 4;
val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16); val = ((val >> 16) & 0xFFFF) | ((val & 0xFFFF) << 16);
if(!j) if (!j)
y0 = (val & 0x1F) << 2; y0 = (val & 0x1F) << 2;
else else
y0 = y3 + xl_table[val & 0x1F]; y0 = y3 + xl_table[val & 0x1F];
@@ -91,12 +91,12 @@ static int decode_frame(AVCodecContext *avctx,
val >>= 6; /* align to word */ val >>= 6; /* align to word */
y3 = y2 + xl_table[val & 0x1F]; y3 = y2 + xl_table[val & 0x1F];
val >>= 5; val >>= 5;
if(!j) if (!j)
c0 = (val & 0x1F) << 2; c0 = (val & 0x1F) << 2;
else else
c0 += xl_table[val & 0x1F]; c0 += xl_table[val & 0x1F];
val >>= 5; val >>= 5;
if(!j) if (!j)
c1 = (val & 0x1F) << 2; c1 = (val & 0x1F) << 2;
else else
c1 += xl_table[val & 0x1F]; c1 += xl_table[val & 0x1F];