10l to Benoit, poll.h is already included below, and this broke compilation on mingw

[ffmpeg] / libavcodec / simple_idct.h

diff --git a/libavcodec/simple_idct.h b/libavcodec/simple_idct.h
index 2da822771b5491bb86113ab37515cb70ac1ff848..43f4ad2fe11c3b6b705ffcaaed21fb040606e3e7 100644 (file)
--- a/libavcodec/simple_idct.h
+++ b/libavcodec/simple_idct.h
@@ -3,26 +3,34 @@
  *
  * Copyright (c) 2001 Michael Niedermayer <michaelni@gmx.at>
  *
- * This library is free software; you can redistribute it and/or
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /**
  * @file simple_idct.h
  * simple idct header.
  */
- 
+
+#ifndef AVCODEC_SIMPLE_IDCT_H
+#define AVCODEC_SIMPLE_IDCT_H
+
+#include <stdint.h>
+#include "dsputil.h"
+
 void simple_idct_put(uint8_t *dest, int line_size, DCTELEM *block);
 void simple_idct_add(uint8_t *dest, int line_size, DCTELEM *block);
 void ff_simple_idct_mmx(int16_t *block);
@@ -34,3 +42,5 @@ void simple_idct248_put(uint8_t *dest, int line_size, DCTELEM *block);
 
 void simple_idct84_add(uint8_t *dest, int line_size, DCTELEM *block);
 void simple_idct48_add(uint8_t *dest, int line_size, DCTELEM *block);
+
+#endif // AVCODEC_SIMPLE_IDCT_H