Merge commit '0d439fbede03854eac8a978cccf21a3425a3c82d'

* commit '0d439fbede03854eac8a978cccf21a3425a3c82d':
  dsputil: Split off HuffYUV decoding bits into their own context

Conflicts:
	configure
	libavcodec/dsputil.c
	libavcodec/dsputil.h
	libavcodec/huffyuv.h
	libavcodec/huffyuvdec.c
	libavcodec/lagarith.c
	libavcodec/vble.c
	libavcodec/x86/Makefile
	libavcodec/x86/dsputil.asm
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/dsputil_mmx.c

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

1 files changed, 41 insertions, 0 deletions

diff --git a/libavcodec/huffyuvdsp.h b/libavcodec/huffyuvdsp.h
new file mode 100644
index 0000000000..e08a96b0bb
--- /dev/null
+++ b/libavcodec/huffyuvdsp.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * 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.
+ *
+ * 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_HUFFYUVDSP_H
+#define AVCODEC_HUFFYUVDSP_H
+
+#include <stdint.h>
+
+typedef struct HuffYUVDSPContext {
+    void (*add_bytes)(uint8_t *dst /* align 16 */, uint8_t *src /* align 16 */,
+                      int w);
+    void (*add_hfyu_median_pred)(uint8_t *dst, const uint8_t *top,
+                                 const uint8_t *diff, int w,
+                                 int *left, int *left_top);
+    int (*add_hfyu_left_pred)(uint8_t *dst, const uint8_t *src,
+                              int w, int left);
+    void (*add_hfyu_left_pred_bgr32)(uint8_t *dst, const uint8_t *src,
+                                     int w, int *red, int *green,
+                                     int *blue, int *alpha);
+} HuffYUVDSPContext;
+
+void ff_huffyuvdsp_init(HuffYUVDSPContext *c);
+void ff_huffyuvdsp_init_ppc(HuffYUVDSPContext *c);
+void ff_huffyuvdsp_init_x86(HuffYUVDSPContext *c);
+
+#endif /* AVCODEC_HUFFYUVDSP_H */