Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(983)

Side by Side Diff: source/patched-ffmpeg-mt/libavcodec/vp56dsp.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org> 2 * Copyright (c) 2006 Aurelien Jacobs <aurel@gnuage.org>
3 * Copyright (c) 2010 Mans Rullgard <mans@mansr.com> 3 * Copyright (c) 2010 Mans Rullgard <mans@mansr.com>
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 VP56_EDGE_FILTER(vp6, ver, stride, 1) 75 VP56_EDGE_FILTER(vp6, ver, stride, 1)
76 76
77 void ff_vp56dsp_init(VP56DSPContext *s, enum CodecID codec) 77 void ff_vp56dsp_init(VP56DSPContext *s, enum CodecID codec)
78 { 78 {
79 if (codec == CODEC_ID_VP5) { 79 if (codec == CODEC_ID_VP5) {
80 s->edge_filter_hor = vp5_edge_filter_hor; 80 s->edge_filter_hor = vp5_edge_filter_hor;
81 s->edge_filter_ver = vp5_edge_filter_ver; 81 s->edge_filter_ver = vp5_edge_filter_ver;
82 } else { 82 } else {
83 s->edge_filter_hor = vp6_edge_filter_hor; 83 s->edge_filter_hor = vp6_edge_filter_hor;
84 s->edge_filter_ver = vp6_edge_filter_ver; 84 s->edge_filter_ver = vp6_edge_filter_ver;
85
86 if (CONFIG_VP6_DECODER) {
87 s->vp6_filter_diag4 = ff_vp6_filter_diag4_c;
88 }
85 } 89 }
86 90
87 if (ARCH_ARM) ff_vp56dsp_init_arm(s, codec); 91 if (ARCH_ARM) ff_vp56dsp_init_arm(s, codec);
92 if (HAVE_MMX) ff_vp56dsp_init_x86(s, codec);
88 } 93 }
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/vp56dsp.h ('k') | source/patched-ffmpeg-mt/libavcodec/vp56rac.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698