Simplify l1mv/l1ref calculation.

[ffmpeg] / libavcodec / dvdata.h

diff --git a/libavcodec/dvdata.h b/libavcodec/dvdata.h
index e072a9d3b83033d2046a944e6d06e3e760b62c7d..7d8f19df838618744df6e75380bbd71d759d2dea 100644 (file)
--- a/libavcodec/dvdata.h
+++ b/libavcodec/dvdata.h
@@ -27,8 +27,8 @@
 #ifndef FFMPEG_DVDATA_H
 #define FFMPEG_DVDATA_H
 
+#include "libavutil/rational.h"
 #include "avcodec.h"
-#include "rational.h"
 
 /*
  * DVprofile is used to express the differences between various
@@ -335,7 +335,7 @@ static const uint8_t dv_quant_shifts[22][4] = {
 
 static const uint8_t dv_quant_offset[4] = { 6, 3, 0, 1 };
 
-/* NOTE: I prefer hardcoding the positionning of dv blocks, it is
+/* NOTE: I prefer hardcoding the positioning of dv blocks, it is
    simpler :-) */
 
 static const uint16_t dv_place_420[1620] = {
@@ -2661,7 +2661,7 @@ enum dv_pack_type {
 /* largest possible DV frame, in bytes (PAL 50Mbps) */
 #define DV_MAX_FRAME_SIZE 288000
 
-static inline const DVprofile* dv_frame_profile(uint8_t* frame)
+static inline const DVprofile* dv_frame_profile(const uint8_t* frame)
 {
     if ((frame[3] & 0x80) == 0) {      /* DSF flag */
         /* it's an NTSC format */