Merge remote branch 'qatar/master'

[ffmpeg] / libavcodec / rangecoder.h

diff --git a/libavcodec/rangecoder.h b/libavcodec/rangecoder.h
index 3aac8c6238600b490925464552b12cf51c6fd311..47c0362ba3bb91a9a6d668d824d07a5f5cc9226e 100644 (file)
--- a/libavcodec/rangecoder.h
+++ b/libavcodec/rangecoder.h
@@ -17,14 +17,20 @@
  * 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
- *
  */
 
 /**
- * @file rangecoder.h
+ * @file
  * Range coder.
  */
 
+#ifndef AVCODEC_RANGECODER_H
+#define AVCODEC_RANGECODER_H
+
+#include <stdint.h>
+#include <assert.h>
+#include "libavutil/common.h"
+
 typedef struct RangeCoder{
     int low;
     int range;
@@ -103,7 +109,7 @@ static inline void refill(RangeCoder *c){
 
 static inline int get_rac(RangeCoder *c, uint8_t * const state){
     int range1= (c->range * (*state)) >> 8;
-    int attribute_unused one_mask;
+    int av_unused one_mask;
 
     c->range -= range1;
 #if 1
@@ -132,3 +138,4 @@ static inline int get_rac(RangeCoder *c, uint8_t * const state){
 #endif
 }
 
+#endif /* AVCODEC_RANGECODER_H */