diff options
Diffstat (limited to 'libavcodec/vp8.h')
| -rw-r--r-- | libavcodec/vp8.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index 6555629806..c9a7906df0 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 */ @@ -34,6 +34,8 @@ #include "thread.h" #if HAVE_PTHREADS #include <pthread.h> +#elif HAVE_OS2THREADS +#include "compat/os2threads.h" #elif HAVE_W32THREADS #include "compat/w32pthreads.h" #endif @@ -120,7 +122,7 @@ typedef struct VP8ThreadData { #endif int thread_mb_pos; // (mb_y << 16) | (mb_x & 0xFFFF) int wait_mb_pos; // What the current thread is waiting on. - uint8_t *edge_emu_buffer; + DECLARE_ALIGNED(16, uint8_t, edge_emu_buffer)[21*32]; VP8FilterStrength *filter_strength; } VP8ThreadData; |