Merge remote-tracking branch 'qatar/master'

* qatar/master:
  intrax8: move functions from dsputil to own context

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dsputil.c
Simple merge

diff --cc libavcodec/dsputil.h
Simple merge

diff --cc libavcodec/intrax8.c
Simple merge

diff --cc libavcodec/intrax8.h
Simple merge

diff --cc libavcodec/intrax8dsp.c
Simple merge

diff --cc libavcodec/intrax8dsp.h
index 0000000000000000000000000000000000000000,d67fa4eda5e16c6b68c00877c4bd65f3f9ec5385..669b04f016002fb33c7255c1d73e284aadaff160
mode 000000,100644..100644
--- /dev/null
--- 2/libavcodec/intrax8dsp.h
+++ b/libavcodec/intrax8dsp.h
@@@ -1,0 -1,33 +1,33 @@@
 - * This file is part of Libav.
+ /*
 - * Libav is free software; you can redistribute it and/or
++ * This file is part of FFmpeg.
+  *
 - * Libav is distributed in the hope that it will be useful,
++ * FFmpeg is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+  * version 2.1 of the License, or (at your option) any later version.
+  *
 - * License along with Libav; if not, write to the Free Software
++ * FFmpeg is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
++ * License along with FFmpeg; if not, write to the Free Software
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  */
+ 
+ #ifndef AVCODEC_INTRAX8DSP_H
+ #define AVCODEC_INTRAX8DSP_H
+ 
+ typedef struct IntraX8DSPContext {
+     void (*v_loop_filter)(uint8_t *src, int stride, int qscale);
+     void (*h_loop_filter)(uint8_t *src, int stride, int qscale);
+ 
+     void (*spatial_compensation[12])(uint8_t *src , uint8_t *dst, int linesize);
+     void (*setup_spatial_compensation)(uint8_t *src, uint8_t *dst, int linesize,
+                                        int *range, int *sum,  int edges);
+ } IntraX8DSPContext;
+ 
+ void ff_intrax8dsp_init(IntraX8DSPContext *dsp);
+ 
+ #endif /* AVCODEC_INTRAX8DSP_H */