diff options
Diffstat (limited to 'libavcodec/wmv2.h')
| -rw-r--r-- | libavcodec/wmv2.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index b77dd98cd5..0f459ae5ae 100644 --- a/libavcodec/wmv2.h +++ b/libavcodec/wmv2.h @@ -1,20 +1,20 @@ /* - * Copyright (c) 2002 The Libav Project + * Copyright (c) 2002 The FFmpeg Project * - * 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 */ @@ -51,7 +51,7 @@ typedef struct Wmv2Context { int hshift; ScanTable abt_scantable[2]; - DECLARE_ALIGNED(16, int16_t, abt_block2)[6][64]; + DECLARE_ALIGNED(32, int16_t, abt_block2)[6][64]; } Wmv2Context; void ff_wmv2_common_init(Wmv2Context *w); @@ -70,4 +70,16 @@ void ff_mspel_motion(MpegEncContext *s, uint8_t **ref_picture, op_pixels_func (*pix_op)[4], int motion_x, int motion_y, int h); + +static av_always_inline int wmv2_get_cbp_table_index(MpegEncContext *s, int cbp_index) +{ + static const uint8_t map[3][3] = { + { 0, 2, 1 }, + { 1, 0, 2 }, + { 2, 1, 0 }, + }; + + return map[(s->qscale > 10) + (s->qscale > 20)][cbp_index]; +} + #endif /* AVCODEC_WMV2_H */ |