diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-09 21:51:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-09 21:51:06 +0200 |
| commit | ebba05b3c51cffbfe2f758dd6bc70c4f14906dfe (patch) | |
| tree | 218d3a045bb37f0d3e727e39f957d2e554ee1b7b | |
| parent | fd0247f8333029ec5b3451bf3c3cddc363ffc53b (diff) | |
| download | ffmpeg-ebba05b3c51cffbfe2f758dd6bc70c4f14906dfe.tar.gz | |
prores:cosmetics
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/proresdec_gpl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/proresdec_gpl.c b/libavcodec/proresdec_gpl.c index 96da844d3f..9fbb8ee5ce 100644 --- a/libavcodec/proresdec_gpl.c +++ b/libavcodec/proresdec_gpl.c @@ -171,7 +171,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, ctx->frame.top_field_first = ctx->frame_type == 1; } - avctx->pix_fmt = ((buf[12] & 0xC0) == 0xC0) ? PIX_FMT_YUV444P10 : PIX_FMT_YUV422P10; + avctx->pix_fmt = (buf[12] & 0xC0) == 0xC0 ? PIX_FMT_YUV444P10 : PIX_FMT_YUV422P10; ptr = buf + 20; flags = buf[19]; @@ -298,7 +298,7 @@ static int decode_picture_header(AVCodecContext *avctx, const uint8_t *buf, cons rice_order = codebook >> 5; \ exp_order = (codebook >> 2) & 7; \ \ - q = 31-av_log2(buf); \ + q = 31 - av_log2(buf); \ \ if (q > switch_bits) { /* exp golomb */ \ bits = exp_order - switch_bits + (q<<1); \ @@ -558,7 +558,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, int buf_size = avpkt->size; int frame_hdr_size, pic_size; - if (buf_size < 28 || AV_RL32(buf + 4) != AV_RL32("icpf")) { + if (buf_size < 28 || AV_RL32(buf + 4) != AV_RL32("icpf")) { av_log(avctx, AV_LOG_ERROR, "invalid frame header\n"); return -1; } |