X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsmvjpegdec.c;h=7ea82ebfeed5ef152d2bc8916b4c3bb1a6baa90f;hb=d6fc031caf64eed921bbdef86d79d56bfc2633b0;hp=018e135b30010f49b6a0240c6ed445046d2ed2ce;hpb=6c59f05c74d87b169bd9775e6a399ed298742137;p=ffmpeg diff --git a/libavcodec/smvjpegdec.c b/libavcodec/smvjpegdec.c index 018e135b300..7ea82ebfeed 100644 --- a/libavcodec/smvjpegdec.c +++ b/libavcodec/smvjpegdec.c @@ -71,7 +71,7 @@ static inline void smv_img_pnt(uint8_t *dst_data[4], uint8_t *src_data[4], src_linesizes[i], h, nlines); } if (desc->flags & AV_PIX_FMT_FLAG_PAL || - desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL) + desc->flags & FF_PSEUDOPAL) dst_data[1] = src_data[1]; } @@ -193,7 +193,6 @@ static int smvjpeg_decode_frame(AVCodecContext *avctx, void *data, int *data_siz s->picture[1]->width = avctx->width; s->picture[1]->height = avctx->height; s->picture[1]->format = avctx->pix_fmt; - /* ff_init_buffer_info(avctx, &s->picture[1]); */ smv_img_pnt(s->picture[1]->data, mjpeg_data->data, mjpeg_data->linesize, avctx->pix_fmt, avctx->width, avctx->height, cur_frame); for (i = 0; i < AV_NUM_DATA_POINTERS; i++)