Merge commit 'aa8d8953'

* commit 'aa8d8953':
  bfin: Don't use the vp3 idct functions if bitexact behaviour is expected

Conflicts:
	libavcodec/bfin/vp3_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/bfin/vp3_bfin.c

@@ -55,6 +55,8 @@ av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags)
 {
     // FIXME: these functions are disabled because they expect unpermutated
     // IDCT coefficients as input, but the coefficients are transposed
-    //c->idct_add = ff_bfin_vp3_idct_add;
-    //c->idct_put = ff_bfin_vp3_idct_put;
+//     if (!(flags & CODEC_FLAG_BITEXACT)) {
+//         c->idct_add = ff_bfin_vp3_idct_add;
+//         c->idct_put = ff_bfin_vp3_idct_put;
+//     }
 }