[FFmpeg-cvslog] r22309 - in trunk/libavcodec/arm: mpegvideo_arm.c mpegvideo_arm.h mpegvideo_armv5te.c mpegvideo_iwmmxt.c
mru
subversion
Mon Mar 8 03:36:07 CET 2010
Author: mru
Date: Mon Mar 8 03:36:07 2010
New Revision: 22309
Log:
ARM: move mpegvideo prototypes to a header file
Added:
trunk/libavcodec/arm/mpegvideo_arm.h
- copied, changed from r22308, trunk/libavcodec/arm/mpegvideo_arm.c
Modified:
trunk/libavcodec/arm/mpegvideo_arm.c
trunk/libavcodec/arm/mpegvideo_armv5te.c
trunk/libavcodec/arm/mpegvideo_iwmmxt.c
Modified: trunk/libavcodec/arm/mpegvideo_arm.c
==============================================================================
--- trunk/libavcodec/arm/mpegvideo_arm.c Mon Mar 8 03:36:03 2010 (r22308)
+++ trunk/libavcodec/arm/mpegvideo_arm.c Mon Mar 8 03:36:07 2010 (r22309)
@@ -21,9 +21,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
-
-void MPV_common_init_iwmmxt(MpegEncContext *s);
-void MPV_common_init_armv5te(MpegEncContext *s);
+#include "mpegvideo_arm.h"
void MPV_common_init_arm(MpegEncContext *s)
{
Copied and modified: trunk/libavcodec/arm/mpegvideo_arm.h (from r22308, trunk/libavcodec/arm/mpegvideo_arm.c)
==============================================================================
--- trunk/libavcodec/arm/mpegvideo_arm.c Mon Mar 8 03:36:03 2010 (r22308, copy source)
+++ trunk/libavcodec/arm/mpegvideo_arm.h Mon Mar 8 03:36:07 2010 (r22309)
@@ -1,6 +1,4 @@
/*
- * Copyright (c) 2002 Michael Niedermayer
- *
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
@@ -18,23 +16,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegvideo.h"
+#ifndef AVCODEC_ARM_MPEGVIDEO_H
+#define AVCODEC_ARM_MPEGVIDEO_H
void MPV_common_init_iwmmxt(MpegEncContext *s);
void MPV_common_init_armv5te(MpegEncContext *s);
-void MPV_common_init_arm(MpegEncContext *s)
-{
- /* IWMMXT support is a superset of armv5te, so
- * allow optimized functions for armv5te unless
- * a better iwmmxt function exists
- */
-#if HAVE_ARMV5TE
- MPV_common_init_armv5te(s);
#endif
-#if HAVE_IWMMXT
- MPV_common_init_iwmmxt(s);
-#endif
-}
Modified: trunk/libavcodec/arm/mpegvideo_armv5te.c
==============================================================================
--- trunk/libavcodec/arm/mpegvideo_armv5te.c Mon Mar 8 03:36:03 2010 (r22308)
+++ trunk/libavcodec/arm/mpegvideo_armv5te.c Mon Mar 8 03:36:07 2010 (r22309)
@@ -22,6 +22,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
+#include "mpegvideo_arm.h"
void ff_dct_unquantize_h263_armv5te(DCTELEM *block, int qmul, int qadd, int count);
Modified: trunk/libavcodec/arm/mpegvideo_iwmmxt.c
==============================================================================
--- trunk/libavcodec/arm/mpegvideo_iwmmxt.c Mon Mar 8 03:36:03 2010 (r22308)
+++ trunk/libavcodec/arm/mpegvideo_iwmmxt.c Mon Mar 8 03:36:07 2010 (r22309)
@@ -21,6 +21,7 @@
#include "libavcodec/avcodec.h"
#include "libavcodec/dsputil.h"
#include "libavcodec/mpegvideo.h"
+#include "mpegvideo_arm.h"
static void dct_unquantize_h263_intra_iwmmxt(MpegEncContext *s,
DCTELEM *block, int n, int qscale)
More information about the ffmpeg-cvslog
mailing list