generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc'

Browse Source 
* commit 'a846dccb29d2bb0798af1d47d06100eda9ca87cc':
  h264chroma: x86: Fix building with yasm disabled
  rv34: Drop now unnecessary dsputil dependencies

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-02-07 13:35:49 +01:00
parent c4e394e460 a846dccb29
commit 60a0bc46cd
11 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/arm/rv40dsp_init_arm.c
View File

@@ -139,7 +139,7 @@ static av_cold void ff_rv40dsp_init_neon(RV34DSPContext *c)
c->rv40_weak_loop_filter[1] = ff_rv40_v_weak_loop_filter_neon;
}
av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c, DSPContext *dsp)
av_cold void ff_rv40dsp_init_arm(RV34DSPContext *c)
{
int cpu_flags = av_get_cpu_flags();