Michael Niedermayer ha scritto:
This could as well be in swscale_internal.h so swscale_avoption.h would not be
needed at all
[...]
done.
--
Keiji Costantini
>From 09322a614a92df81985ccf62a4582632bc853689 Mon Sep 17 00:00:00 2001
From: strites <[EMAIL PROTECTED]>
Date: Sun, 4 May 2008 22:36:52 +0200
Subject: [PATCH] get rid of swscale_avoption.h
---
swscale.c | 2 --
swscale_avoption.h | 26 --------------------------
swscale_internal.h | 2 ++
3 files changed, 2 insertions(+), 28 deletions(-)
delete mode 100644 swscale_avoption.h
diff --git a/swscale.c b/swscale.c
index fdfd5e3..7ef30c8 100644
--- a/swscale.c
+++ b/swscale.c
@@ -193,8 +193,6 @@ extern const uint8_t dither_8x8_32[8][8];
extern const uint8_t dither_8x8_73[8][8];
extern const uint8_t dither_8x8_220[8][8];
-#include "swscale_avoption.h"
-
const char *sws_format_name(enum PixelFormat format)
{
switch (format) {
diff --git a/swscale_avoption.h b/swscale_avoption.h
deleted file mode 100644
index e585dc7..0000000
--- a/swscale_avoption.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2001-2003 Michael Niedermayer <[EMAIL PROTECTED]>
- *
- * 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 FFMPEG_SWSCALE_AVOPTION_H
-#define FFMPEG_SWSCALE_AVOPTION_H
-
-extern const AVClass sws_context_class;
-
-#endif /* FFMPEG_SWSCALE_AVOPTION_H */
diff --git a/swscale_internal.h b/swscale_internal.h
index 07469fa..33dd34e 100644
--- a/swscale_internal.h
+++ b/swscale_internal.h
@@ -275,4 +275,6 @@ static inline int fmt_depth(int fmt)
}
}
+extern const AVClass sws_context_class;
+
#endif /* FFMPEG_SWSCALE_INTERNAL_H */
--
1.5.3.7
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
