[FFmpeg-cvslog] r19767 - in trunk/libavcodec: v210dec.c v210enc.c
diego
subversion
Sat Sep 5 13:22:36 CEST 2009
Author: diego
Date: Sat Sep 5 13:22:36 2009
New Revision: 19767
Log:
prettyprinting cosmetics
Modified:
trunk/libavcodec/v210dec.c
trunk/libavcodec/v210enc.c
Modified: trunk/libavcodec/v210dec.c
==============================================================================
--- trunk/libavcodec/v210dec.c Sat Sep 5 12:59:09 2009 (r19766)
+++ trunk/libavcodec/v210dec.c Sat Sep 5 13:22:36 2009 (r19767)
@@ -32,15 +32,16 @@ static av_cold int decode_init(AVCodecCo
}
if (avcodec_check_dimensions(avctx, avctx->width, avctx->height) < 0)
return -1;
- avctx->pix_fmt = PIX_FMT_YUV422P16;
+ avctx->pix_fmt = PIX_FMT_YUV422P16;
avctx->bits_per_raw_sample = 10;
- avctx->coded_frame = avcodec_alloc_frame();
+ avctx->coded_frame = avcodec_alloc_frame();
return 0;
}
-static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt)
+static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
+ AVPacket *avpkt)
{
int h, w;
AVFrame *pic = avctx->coded_frame;
@@ -67,9 +68,9 @@ static int decode_frame(AVCodecContext *
pic->pict_type = FF_I_TYPE;
pic->key_frame = 1;
-#define READ_PIXELS(a, b, c) \
- do { \
- val = le2me_32(*src++); \
+#define READ_PIXELS(a, b, c) \
+ do { \
+ val = le2me_32(*src++); \
*a++ = val << 6; \
*b++ = (val >> 4) & 0xFFC0; \
*c++ = (val >> 14) & 0xFFC0; \
@@ -100,9 +101,9 @@ static int decode_frame(AVCodecContext *
}
psrc += stride;
- y += pic->linesize[0]/2 - avctx->width;
- u += pic->linesize[1]/2 - avctx->width/2;
- v += pic->linesize[2]/2 - avctx->width/2;
+ y += pic->linesize[0] / 2 - avctx->width;
+ u += pic->linesize[1] / 2 - avctx->width / 2;
+ v += pic->linesize[2] / 2 - avctx->width / 2;
}
*data_size = sizeof(AVFrame);
Modified: trunk/libavcodec/v210enc.c
==============================================================================
--- trunk/libavcodec/v210enc.c Sat Sep 5 12:59:09 2009 (r19766)
+++ trunk/libavcodec/v210enc.c Sat Sep 5 13:22:36 2009 (r19767)
@@ -48,7 +48,8 @@ static av_cold int encode_init(AVCodecCo
return 0;
}
-static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data)
+static int encode_frame(AVCodecContext *avctx, unsigned char *buf,
+ int buf_size, void *data)
{
const AVFrame *pic = data;
int aligned_width = ((avctx->width + 47) / 48) * 48;
@@ -101,9 +102,9 @@ static int encode_frame(AVCodecContext *
pdst += stride;
memset(p, 0, pdst - p);
p = pdst;
- y += pic->linesize[0]/2 - avctx->width;
- u += pic->linesize[1]/2 - avctx->width/2;
- v += pic->linesize[2]/2 - avctx->width/2;
+ y += pic->linesize[0] / 2 - avctx->width;
+ u += pic->linesize[1] / 2 - avctx->width / 2;
+ v += pic->linesize[2] / 2 - avctx->width / 2;
}
return p - buf;
More information about the ffmpeg-cvslog
mailing list