matroskadec: use new metadata API to export some simple information

[ffmpeg] / libavcodec / rectangle.h

diff --git a/libavcodec/rectangle.h b/libavcodec/rectangle.h
index e1388629825c6009b77422978aee0adba8bd3174..cfd0f0696dfcc881e565fbe64c8fbb8b0737d8a9 100644 (file)
--- a/libavcodec/rectangle.h
+++ b/libavcodec/rectangle.h
@@ -20,15 +20,18 @@
  */
 
 /**
- * @file rectangle.h
+ * @file libavcodec/rectangle.h
  * useful rectangle filling function
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef FFMPEG_RECTANGLE_H
-#define FFMPEG_RECTANGLE_H
+#ifndef AVCODEC_RECTANGLE_H
+#define AVCODEC_RECTANGLE_H
 
-#include "common.h"
+#include <assert.h>
+#include "config.h"
+#include "libavutil/common.h"
+#include "dsputil.h"
 
 /**
  * fill a rectangle.
@@ -64,7 +67,7 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride,
         *(uint32_t*)(p + 3*stride)= v;
     }else if(w==8){
     //gcc can't optimize 64bit math on x86_32
-#ifdef HAVE_FAST_64BIT
+#if HAVE_FAST_64BIT
         const uint64_t v= val*0x0100000001ULL;
         *(uint64_t*)(p + 0*stride)= v;
         if(h==1) return;
@@ -118,4 +121,4 @@ static av_always_inline void fill_rectangle(void *vp, int w, int h, int stride,
     assert(h==4);
 }
 
-#endif /* FFMPEG_RECTANGLE_H */
+#endif /* AVCODEC_RECTANGLE_H */