diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-09-05 11:22:36 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-09-05 11:22:36 +0000 |
| commit | d87d5025aaf5ca784db5be942a392002d6a533b3 (patch) | |
| tree | 32928ac68dd7da0fdfb371977fb8e342bc6f387d | |
| parent | bbb0bdd533d0f47c658133f0a5530e0de2f7b762 (diff) | |
| download | ffmpeg-d87d5025aaf5ca784db5be942a392002d6a533b3.tar.gz | |
prettyprinting cosmetics
Originally committed as revision 19767 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/v210dec.c | 19 | ||||
| -rw-r--r-- | libavcodec/v210enc.c | 9 |
2 files changed, 15 insertions, 13 deletions
diff --git a/libavcodec/v210dec.c b/libavcodec/v210dec.c index 7e7f944b2c..f4b2ebe67e 100644 --- a/libavcodec/v210dec.c +++ b/libavcodec/v210dec.c @@ -32,15 +32,16 @@ static av_cold int decode_init(AVCodecContext *avctx) } 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 *avctx, void *data, int *data_size, AVPac 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 *avctx, void *data, int *data_size, AVPac } 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); diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c index 9a90d243ed..f69854efd4 100644 --- a/libavcodec/v210enc.c +++ b/libavcodec/v210enc.c @@ -48,7 +48,8 @@ static av_cold int encode_init(AVCodecContext *avctx) 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 *avctx, unsigned char *buf, int buf_size, 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; |