← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty

« back to all changes in this revision

Viewing changes to libavcodec/arm/h264pred_init_arm.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2011-04-19 15:04:55 UTC
  • mfrom: (1.2.1 upstream)
  • mto: (1.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20110419150455-c1nac6gjm3t2aa4n
Tags: 4:0.7~b1-1
* New upstream version
* bump SONAME and SHLIBS
* configure flags --disable-stripping was removed upstream
* the MAINTAINERS file was removed upstream
* remove patch disable-configuration-warning.patch
* drop avfilter confflags, it is enable by default in 0.7
* libfaad wrapper has been removed upstream
* also update the *contents* of the lintian overrides

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/arm/h264pred_init_arm.c
1
1
/*
2
2
 * Copyright (c) 2009 Mans Rullgard <mans@mansr.com>
3
3
 *
4
 
 * This file is part of FFmpeg.
 
4
 * This file is part of Libav.
5
5
 *
6
 
 * FFmpeg is free software; you can redistribute it and/or
 
6
 * Libav is free software; you can redistribute it and/or
7
7
 * modify it under the terms of the GNU Lesser General Public
8
8
 * License as published by the Free Software Foundation; either
9
9
 * version 2.1 of the License, or (at your option) any later version.
10
10
 *
11
 
 * FFmpeg is distributed in the hope that it will be useful,
 
11
 * Libav is distributed in the hope that it will be useful,
12
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
14
 * Lesser General Public License for more details.
15
15
 *
16
16
 * You should have received a copy of the GNU Lesser General Public
17
 
 * License along with FFmpeg; if not, write to the Free Software
 
17
 * License along with Libav; if not, write to the Free Software
18
18
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
19
 */
20
20
 
42
42
void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride);
43
43
void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride);
44
44
 
45
 
#if HAVE_NEON
46
45
static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id)
47
46
{
48
47
    h->pred8x8[VERT_PRED8x8     ] = ff_pred8x8_vert_neon;
49
48
    h->pred8x8[HOR_PRED8x8      ] = ff_pred8x8_hor_neon;
50
 
    h->pred8x8[PLANE_PRED8x8    ] = ff_pred8x8_plane_neon;
 
49
    if (codec_id != CODEC_ID_VP8)
 
50
        h->pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon;
51
51
    h->pred8x8[DC_128_PRED8x8   ] = ff_pred8x8_128_dc_neon;
52
 
    if (codec_id != CODEC_ID_RV40) {
 
52
    if (codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) {
53
53
        h->pred8x8[DC_PRED8x8     ] = ff_pred8x8_dc_neon;
54
54
        h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon;
55
55
        h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon;
65
65
    h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon;
66
66
    h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon;
67
67
    h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
68
 
    if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40)
 
68
    if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8)
69
69
        h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_neon;
70
70
}
71
 
#endif
72
71
 
73
72
void ff_h264_pred_init_arm(H264PredContext *h, int codec_id)
74
73
{