X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Froqvideo.h;h=e7af474da8df6a4053c408f81d0b5c90ebe5c6a0;hb=3143f13345e4a206dc03491255116a1eb8119ae0;hp=f4efac7e3c77daa804af7af972f5ea6dffa21b91;hpb=7299663a50b5fd98444252dd7a7a2482cee25f71;p=ffmpeg diff --git a/libavcodec/roqvideo.h b/libavcodec/roqvideo.h index f4efac7e3c7..e7af474da8d 100644 --- a/libavcodec/roqvideo.h +++ b/libavcodec/roqvideo.h @@ -19,20 +19,20 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef AVCODEC_ROQVIDEO_H -#define AVCODEC_ROQVIDEO_H +#ifndef FFMPEG_ROQVIDEO_H +#define FFMPEG_ROQVIDEO_H +#include "libavutil/random.h" #include "avcodec.h" #include "dsputil.h" -#include "random.h" typedef struct { - unsigned char y[4]; - unsigned char u, v; + unsigned char y[4]; + unsigned char u, v; } roq_cell; typedef struct { - int idx[4]; + int idx[4]; } roq_qcell; typedef struct { @@ -47,13 +47,11 @@ typedef struct RoqContext { AVFrame *last_frame; AVFrame *current_frame; int first_frame; - int y_stride; - int c_stride; roq_cell cb2x2[256]; roq_qcell cb4x4[256]; - unsigned char *buf; + const unsigned char *buf; int size; int width, height; @@ -91,4 +89,4 @@ void ff_apply_motion_4x4(RoqContext *ri, int x, int y, int deltax, int deltay); void ff_apply_motion_8x8(RoqContext *ri, int x, int y, int deltax, int deltay); -#endif // AVCODEC_ROQVIDEO_H +#endif /* FFMPEG_ROQVIDEO_H */