From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 9 Feb 2013 13:01:40 +0000 (+0100)
Subject: Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=81a11452f8e0b486299905601460d6d2f7eaa548;p=ffmpeg

Merge commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf'

* commit 'bf6b3ec924b4fb64d14df33077f4d4541d525dbf':
  dsputil: Move rnd_avg inline functions to a separate header

Merged-by: Michael Niedermayer <michaelni@gmx.at>
---

81a11452f8e0b486299905601460d6d2f7eaa548
diff --cc libavcodec/vc1dsp.c
index 7ad63afd784,99ede18df79..260eda401bf
--- a/libavcodec/vc1dsp.c
+++ b/libavcodec/vc1dsp.c
@@@ -25,9 -25,8 +25,10 @@@
   *
   */
  
 +#include "libavutil/avassert.h"
  #include "libavutil/common.h"
  #include "h264chroma.h"
++#include "rnd_avg.h"
  #include "vc1dsp.h"