X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Ftruemotion2.c;h=494dfd55fc0dd0625ff6c8fc72a467ce5cf3b045;hb=fd2982a0a01942091b2f08e17486ff4562f675a6;hp=e9bc6b7cbef881d138f174143cb08827742e7f11;hpb=fead30d4440bc7b75006ae60f2742c63a05168b3;p=ffmpeg

diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index e9bc6b7cbef..494dfd55fc0 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -17,7 +17,6 @@
  * 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
- *
  */
 
 /**
@@ -26,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "common.h"
 #include "bitstream.h"
 #include "dsputil.h"
 
@@ -384,7 +382,7 @@ static inline void tm2_apply_deltas(TM2Context *ctx, int* Y, int stride, int *de
             d = deltas[i + j * 4];
             ct += d;
             last[i] += ct;
-            Y[i] = clip_uint8(last[i]);
+            Y[i] = av_clip_uint8(last[i]);
         }
         Y += stride;
         ctx->D[j] = ct;
@@ -735,7 +733,7 @@ static int tm2_decode_blocks(TM2Context *ctx, AVFrame *p)
     src = (ctx->cur?ctx->Y2:ctx->Y1);
     for(j = 0; j < ctx->avctx->height; j++){
         for(i = 0; i < ctx->avctx->width; i++){
-            Y[i] = clip_uint8(*src++);
+            Y[i] = av_clip_uint8(*src++);
         }
         Y += p->linesize[0];
     }
@@ -743,7 +741,7 @@ static int tm2_decode_blocks(TM2Context *ctx, AVFrame *p)
     src = (ctx->cur?ctx->U2:ctx->U1);
     for(j = 0; j < (ctx->avctx->height + 1) >> 1; j++){
         for(i = 0; i < (ctx->avctx->width + 1) >> 1; i++){
-            U[i] = clip_uint8(*src++);
+            U[i] = av_clip_uint8(*src++);
         }
         U += p->linesize[2];
     }
@@ -751,7 +749,7 @@ static int tm2_decode_blocks(TM2Context *ctx, AVFrame *p)
     src = (ctx->cur?ctx->V2:ctx->V1);
     for(j = 0; j < (ctx->avctx->height + 1) >> 1; j++){
         for(i = 0; i < (ctx->avctx->width + 1) >> 1; i++){
-            V[i] = clip_uint8(*src++);
+            V[i] = av_clip_uint8(*src++);
         }
         V += p->linesize[1];
     }
@@ -834,7 +832,6 @@ static int decode_init(AVCodecContext *avctx){
 
     l->avctx = avctx;
     l->pic.data[0]=NULL;
-    avctx->has_b_frames = 0;
     avctx->pix_fmt = PIX_FMT_YUV420P;
 
     dsputil_init(&l->dsp, avctx);