X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fvp8.h;h=534c08160b9137f82d6caa1c8c0f2717fb29edb4;hp=d4a231f8ca571baf41d769cb495234bdc13c2f00;hb=2adcd15f2e02e240b31353285f9336a4cbab8274;hpb=a6ac4fcce44108f6f87278b8d12e890576f46a62 diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index d4a231f8ca..534c08160b 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -6,20 +6,20 @@ * Copyright (C) 2010 Jason Garrett-Glaser * Copyright (C) 2012 Daniel Kang * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -35,6 +35,8 @@ #if HAVE_PTHREADS # include +#elif HAVE_OS2THREADS +# include "compat/os2threads.h" #elif HAVE_W32THREADS # include "compat/w32pthreads.h" #endif @@ -272,6 +274,11 @@ typedef struct VP8Context { */ int mb_layout; + void (*decode_mb_row_no_filter)(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr); + void (*filter_mb_row)(AVCodecContext *avctx, void *tdata, int jobnr, int threadnr); + + int vp7; + /** * Fade bit present in bitstream (VP7) */