diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 12:59:02 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-05 13:00:41 +0200 |
commit | bf7ed956ffcd390b3f5ead2b36d47b068f89178f (patch) | |
tree | 9cdd1e203de9e57536cc3263320506cc69944cec /libavcodec/vc1dsp.c | |
parent | 77aafadc5655401e5806daed58300a2cccb19fb8 (diff) | |
parent | adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed (diff) | |
download | ffmpeg-bf7ed956ffcd390b3f5ead2b36d47b068f89178f.tar.gz |
Merge commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed'
* commit 'adf8227cf4e7b4fccb2ad88e1e09b6dc00dd00ed':
vc-1: Add platform-specific start code search routine to VC1DSPContext.
Conflicts:
configure
libavcodec/arm/vc1dsp_init_arm.c
libavcodec/vc1dsp.c
libavcodec/vc1dsp.h
See: 9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dsp.c')
-rw-r--r-- | libavcodec/vc1dsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dsp.c b/libavcodec/vc1dsp.c index fae9daec6a..73e1001279 100644 --- a/libavcodec/vc1dsp.c +++ b/libavcodec/vc1dsp.c @@ -1025,7 +1025,7 @@ av_cold void ff_vc1dsp_init(VC1DSPContext *dsp) dsp->sprite_v_double_twoscale = sprite_v_double_twoscale_c; #endif /* CONFIG_WMV3IMAGE_DECODER || CONFIG_VC1IMAGE_DECODER */ - dsp->vc1_find_start_code_candidate = ff_startcode_find_candidate_c; + dsp->startcode_find_candidate = ff_startcode_find_candidate_c; if (ARCH_AARCH64) ff_vc1dsp_init_aarch64(dsp); |