[FFmpeg-cvslog] r17280 - in trunk/libavcodec: mpeg12.c mpegvideo.c mpegvideo_xvmc.c xvmc_internal.h

[diego]

Author: diego
Date: Sat Feb 14 21:37:14 2009
New Revision: 17280

Log:
Add xvmc_internal.h that contains all internal xvmc function declarations.
This allows getting rid of a bunch of ugly forward declarations.

Added:
   trunk/libavcodec/xvmc_internal.h
Modified:
   trunk/libavcodec/mpeg12.c
   trunk/libavcodec/mpegvideo.c
   trunk/libavcodec/mpegvideo_xvmc.c

Modified: trunk/libavcodec/mpeg12.c
==============================================================================
--- trunk/libavcodec/mpeg12.c	Sat Feb 14 21:35:10 2009	(r17279)
+++ trunk/libavcodec/mpeg12.c	Sat Feb 14 21:37:14 2009	(r17280)
@@ -35,6 +35,7 @@
 #include "mpeg12decdata.h"
 #include "bytestream.h"
 #include "vdpau_internal.h"
+#include "xvmc_internal.h"
 
 //#undef NDEBUG
 //#include <assert.h>
@@ -61,11 +62,6 @@ static inline int mpeg2_fast_decode_bloc
 static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
 static void exchange_uv(MpegEncContext *s);
 
-int  ff_xvmc_field_start(MpegEncContext *s, AVCodecContext *avctx);
-int  ff_xvmc_field_end(MpegEncContext *s);
-void ff_xvmc_pack_pblocks(MpegEncContext *s,int cbp);
-void ff_xvmc_init_block(MpegEncContext *s);//set s->block
-
 static const enum PixelFormat pixfmt_xvmc_mpg2_420[] = {
                                            PIX_FMT_XVMC_MPEG2_IDCT,
                                            PIX_FMT_XVMC_MPEG2_MC,

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	Sat Feb 14 21:35:10 2009	(r17279)
+++ trunk/libavcodec/mpegvideo.c	Sat Feb 14 21:37:14 2009	(r17280)
@@ -34,6 +34,7 @@
 #include "mjpegenc.h"
 #include "msmpeg4.h"
 #include "faandct.h"
+#include "xvmc_internal.h"
 #include <limits.h>
 
 //#undef NDEBUG
@@ -54,10 +55,6 @@ static void dct_unquantize_h263_intra_c(
 static void dct_unquantize_h263_inter_c(MpegEncContext *s,
                                   DCTELEM *block, int n, int qscale);
 
-int  ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx);
-void ff_xvmc_field_end(MpegEncContext *s);
-void ff_xvmc_decode_mb(MpegEncContext *s);
-
 
 /* enable all paranoid tests for rounding, overflows, etc... */
 //#define PARANOID

Modified: trunk/libavcodec/mpegvideo_xvmc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_xvmc.c	Sat Feb 14 21:35:10 2009	(r17279)
+++ trunk/libavcodec/mpegvideo_xvmc.c	Sat Feb 14 21:37:14 2009	(r17280)
@@ -29,6 +29,7 @@
 #include <assert.h>
 
 #include "xvmc.h"
+#include "xvmc_internal.h"
 
 //set s->block
 void ff_xvmc_init_block(MpegEncContext *s)

Added: trunk/libavcodec/xvmc_internal.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/libavcodec/xvmc_internal.h	Sat Feb 14 21:37:14 2009	(r17280)
@@ -0,0 +1,33 @@
+/*
+ * XVideo Motion Compensation internal functions
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * 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
+ */
+
+#ifndef AVCODEC_INTERNAL_XVMC_H
+#define AVCODEC_INTERNAL_XVMC_H
+
+#include "avcodec.h"
+#include "mpegvideo.h"
+
+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 /* AVCODEC_INTERNAL_XVMC_H */