Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavcodec / jpeg2000dsp.h

diff --git a/ffmpeg/libavutil/intfloat_readwrite.h b/ffmpeg/libavcodec/jpeg2000dsp.h
similarity index 50%
rename from ffmpeg/libavutil/intfloat_readwrite.h
rename to ffmpeg/libavcodec/jpeg2000dsp.h
index 1d79e3e8af38f3b3e84766ac72b105f719052659..de1ddb94cdc28871fb293db137529b616a4da8ce 100644 (file)
--- a/ffmpeg/libavutil/intfloat_readwrite.h
+++ b/ffmpeg/libavcodec/jpeg2000dsp.h
@@ -1,5 +1,7 @@
 /*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ * JPEG 2000 DSP functions
+ * Copyright (c) 2007 Kamil Nowosad
+ * Copyright (c) 2013 Nicolas Bertrand <nicoinattendu@gmail.com>
  *
  * This file is part of FFmpeg.
  *
@@ -18,27 +20,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef AVUTIL_INTFLOAT_READWRITE_H
-#define AVUTIL_INTFLOAT_READWRITE_H
+#ifndef AVCODEC_JPEG2000DSP_H
+#define AVCODEC_JPEG2000DSP_H
 
 #include <stdint.h>
+#include "jpeg2000dwt.h"
 
-#include "attributes.h"
-#include "version.h"
+typedef struct Jpeg2000DSPContext {
+    void (*mct_decode[FF_DWT_NB])(void *src0, void *src1, void *src2, int csize);
+} Jpeg2000DSPContext;
 
-#if FF_API_INTFLOAT
-/* IEEE 80 bits extended float */
-typedef struct AVExtFloat  {
-    uint8_t exponent[2];
-    uint8_t mantissa[8];
-} AVExtFloat;
+void ff_jpeg2000dsp_init(Jpeg2000DSPContext *c);
 
-attribute_deprecated double av_int2dbl(int64_t v) av_const;
-attribute_deprecated float av_int2flt(int32_t v) av_const;
-attribute_deprecated double av_ext2dbl(const AVExtFloat ext) av_const;
-attribute_deprecated int64_t av_dbl2int(double d) av_const;
-attribute_deprecated int32_t av_flt2int(float d) av_const;
-attribute_deprecated AVExtFloat av_dbl2ext(double d) av_const;
-#endif /* FF_API_INTFLOAT */
-
-#endif /* AVUTIL_INTFLOAT_READWRITE_H */
+#endif /* AVCODEC_JPEG2000DSP_H */