Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

[ffmpeg] / libavcodec / xvmc_internal.h

diff --git a/libavcodec/xvmc_internal.h b/libavcodec/xvmc_internal.h
index 6a60add965d656f7311a4a3b167822bdf0f2eb1b..d365ef0266be4dfeb5cf0f87574b65ec0f299f97 100644 (file)
--- a/libavcodec/xvmc_internal.h
+++ b/libavcodec/xvmc_internal.h
@@ -25,14 +25,7 @@
 #include "mpegvideo.h"
 #include "version.h"
 
-#if FF_API_XVMC
-
 void ff_xvmc_init_block(MpegEncContext *s);
 void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp);
-int  ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx);
-void ff_xvmc_field_end(MpegEncContext *s);
-void ff_xvmc_decode_mb(MpegEncContext *s);
-
-#endif /* FF_API_XVMC */
 
 #endif /* AVCODEC_XVMC_INTERNAL_H */