|
|
|
@ -153,7 +153,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, |
|
|
|
|
NuvContext *c = avctx->priv_data; |
|
|
|
|
AVFrame *picture = data; |
|
|
|
|
int orig_size = buf_size; |
|
|
|
|
int keyframe; |
|
|
|
|
int keyframe, ret; |
|
|
|
|
int result, init_frame = !avctx->frame_number; |
|
|
|
|
enum { |
|
|
|
|
NUV_UNCOMPRESSED = '0', |
|
|
|
@ -263,7 +263,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, |
|
|
|
|
} |
|
|
|
|
case NUV_RTJPEG_IN_LZO: |
|
|
|
|
case NUV_RTJPEG: |
|
|
|
|
ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size); |
|
|
|
|
ret = ff_rtjpeg_decode_frame_yuv420(&c->rtj, &c->pic, buf, buf_size); |
|
|
|
|
if (ret < 0) |
|
|
|
|
return ret; |
|
|
|
|
break; |
|
|
|
|
case NUV_BLACK: |
|
|
|
|
memset(c->pic.data[0], 0, c->width * c->height); |
|
|
|
|