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

5
libavcodec/rv30dsp.c
View File

@@ -254,11 +254,12 @@ RV30_MC(put_, 16)
RV30_MC(avg_, 8)
RV30_MC(avg_, 16)
av_cold void ff_rv30dsp_init(RV34DSPContext *c, DSPContext* dsp) {
av_cold void ff_rv30dsp_init(RV34DSPContext *c)
{
H264ChromaContext h264chroma;
H264QpelContext qpel;
ff_rv34dsp_init(c, dsp);
ff_rv34dsp_init(c);
ff_h264chroma_init(&h264chroma, 8);
ff_h264qpel_init(&qpel, 8);