From 0ea721f7ce81357bc4ec6eea609cd50482c3d15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 2 Dec 2006 01:19:48 +0000 Subject: Start working on a branch where FFmpeg is not copied, patched and carved to be built with automake but instead imported inline and built using its own build system. This is an import of a slightly modified FFmpeg current tree. xine-lib builds, install and run fine with it, but there are of course plenty of things that needs to be fixed before it can even be considered for a 1.2.x series. Work will continue in the next days of course. CVS patchset: 8397 CVS date: 2006/12/02 01:19:48 --- src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c | 31 ------------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c (limited to 'src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c') diff --git a/src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c b/src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c deleted file mode 100644 index 263e3c5bc..000000000 --- a/src/libffmpeg/libavcodec/armv4l/mpegvideo_arm.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2002 Michael Niedermayer - * - * This library 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 of the License, or (at your option) any later version. - * - * This library 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "../dsputil.h" -#include "../mpegvideo.h" -#include "../avcodec.h" - -extern void MPV_common_init_iwmmxt(MpegEncContext *s); - -void MPV_common_init_armv4l(MpegEncContext *s) -{ -#ifdef HAVE_IWMMXT - MPV_common_init_iwmmxt(s); -#endif -} -- cgit v1.2.3