|
|
@ -148,7 +148,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, |
|
|
|
if ((avctx->width != s->image_width) || (avctx->height != s->image_height)) { |
|
|
|
if ((avctx->width != s->image_width) || (avctx->height != s->image_height)) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Frame width or height differs from first frames!\n"); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Frame width or height differs from first frames!\n"); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "fh = %d, fv %d vs ch = %d, cv = %d\n", avctx->height, |
|
|
|
av_log(avctx, AV_LOG_ERROR, "fh = %d, fv %d vs ch = %d, cv = %d\n", avctx->height, |
|
|
|
avctx->width,s->image_height, s->image_width); |
|
|
|
avctx->width, s->image_height, s->image_width); |
|
|
|
return -1; |
|
|
|
return -1; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -195,7 +195,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, |
|
|
|
s->zstream.next_in = buf + (get_bits_count(&gb) / 8); |
|
|
|
s->zstream.next_in = buf + (get_bits_count(&gb) / 8); |
|
|
|
s->zstream.avail_in = size; |
|
|
|
s->zstream.avail_in = size; |
|
|
|
s->zstream.next_out = s->tmpblock; |
|
|
|
s->zstream.next_out = s->tmpblock; |
|
|
|
s->zstream.avail_out = s->block_size*3; |
|
|
|
s->zstream.avail_out = s->block_size * 3; |
|
|
|
ret = inflate(&(s->zstream), Z_FINISH); |
|
|
|
ret = inflate(&(s->zstream), Z_FINISH); |
|
|
|
if (ret == Z_DATA_ERROR) { |
|
|
|
if (ret == Z_DATA_ERROR) { |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Zlib resync occurred\n"); |
|
|
|
av_log(avctx, AV_LOG_ERROR, "Zlib resync occurred\n"); |
|
|
|