Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/sheervideo: fix order of operations for raw lines

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/180/merge
Paul B Mahol 9 years ago
parent 60bac785c3
commit c206a32435
1 changed files with 8 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      libavcodec/sheervideo.c

16
libavcodec/sheervideo.c
Unescape View File

@ -887,12 +887,12 @@ static void decode_ca2p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
if (get_bits1(gb)) {
for (x = 0; x < avctx->width; x += 2) {
dst_a[x ] = get_bits(gb, 10);
dst_y[x ] = get_bits(gb, 10);
dst_u[x / 2] = get_bits(gb, 10);
dst_a[x + 1] = get_bits(gb, 10);
dst_y[x + 1] = get_bits(gb, 10);
dst_a[x ] = get_bits(gb, 10);
dst_v[x / 2] = get_bits(gb, 10);
dst_a[x + 1] = get_bits(gb, 10);
}
} else {
int pred[4] = { 502, 512, 512, 502 };
@ -924,12 +924,12 @@ static void decode_ca2p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
for (y = 1; y < avctx->height; y++) {
if (get_bits1(gb)) {
for (x = 0; x < avctx->width; x += 2) {
dst_a[x ] = get_bits(gb, 10);
dst_y[x ] = get_bits(gb, 10);
dst_u[x / 2] = get_bits(gb, 10);
dst_a[x + 1] = get_bits(gb, 10);
dst_y[x + 1] = get_bits(gb, 10);
dst_a[x ] = get_bits(gb, 10);
dst_v[x / 2] = get_bits(gb, 10);
dst_a[x + 1] = get_bits(gb, 10);
}
} else {
int pred_TL[6], pred_L[6], pred_T[6];
@ -989,12 +989,12 @@ static void decode_c82p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
if (get_bits1(gb)) {
for (x = 0; x < avctx->width; x += 2) {
dst_a[x ] = get_bits(gb, 8);
dst_y[x ] = get_bits(gb, 8);
dst_u[x / 2] = get_bits(gb, 8);
dst_a[x + 1] = get_bits(gb, 8);
dst_y[x + 1] = get_bits(gb, 8);
dst_a[x ] = get_bits(gb, 8);
dst_v[x / 2] = get_bits(gb, 8);
dst_a[x + 1] = get_bits(gb, 8);
}
} else {
int pred[4] = { -125, 128, 128, 125 };
@ -1026,12 +1026,12 @@ static void decode_c82p(AVCodecContext *avctx, AVFrame *p, GetBitContext *gb)
for (y = 1; y < avctx->height; y++) {
if (get_bits1(gb)) {
for (x = 0; x < avctx->width; x += 2) {
dst_a[x ] = get_bits(gb, 8);
dst_y[x ] = get_bits(gb, 8);
dst_u[x / 2] = get_bits(gb, 8);
dst_a[x + 1] = get_bits(gb, 8);
dst_y[x + 1] = get_bits(gb, 8);
dst_a[x ] = get_bits(gb, 8);
dst_v[x / 2] = get_bits(gb, 8);
dst_a[x + 1] = get_bits(gb, 8);
}
} else {
int pred_TL[6], pred_L[6], pred_T[6];

Write Preview
Loading…
Cancel
Save