X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmjpegdec.h;h=732aeab9945419bba9ad20ced87e0df4b7fda9f5;hb=7b100839330ace3b4846ee4a1fc5caf4b8f8a34e;hp=d9844adf4ef7f169e17dde35c9d20dc65571142a;hpb=19ce06423964627d553c7ee602fd5c73ca4b2135;p=ffmpeg diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index d9844adf4ef..732aeab9945 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -30,6 +30,7 @@ #define AVCODEC_MJPEGDEC_H #include "libavutil/log.h" +#include "libavutil/mem_internal.h" #include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" @@ -59,7 +60,7 @@ typedef struct MJpegDecodeContext { VLC vlcs[3][4]; int qscale[4]; ///< quantizer scale calculated from quant_matrixes - int org_height; /* size given at codec init */ + int orig_height; /* size given at codec init */ int first_picture; /* true if decoding first picture */ int interlaced; /* true if interlaced */ int bottom_field; /* true if bottom field */ @@ -160,6 +161,8 @@ typedef struct MJpegDecodeContext { void *hwaccel_picture_private; } MJpegDecodeContext; +int ff_mjpeg_build_vlc(VLC *vlc, const uint8_t *bits_table, + const uint8_t *val_table, int is_ac, void *logctx); int ff_mjpeg_decode_init(AVCodecContext *avctx); int ff_mjpeg_decode_end(AVCodecContext *avctx); int ff_mjpeg_receive_frame(AVCodecContext *avctx, AVFrame *frame);