[1/8] lavc: move the version macros to a new installed header.

Message ID 1300136301-5437-1-git-send-email-anton@khirnov.net
State Committed
Headers show

Commit Message

Anton Khirnov March 14, 2011, 8:58 p.m.
---
 libavcodec/Makefile  |    2 +-
 libavcodec/avcodec.h |   52 +----------------------------------
 libavcodec/version.h |   75 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 52 deletions(-)
 create mode 100644 libavcodec/version.h

Comments

Diego Biurrun March 15, 2011, 11:18 p.m. | #1
On Mon, Mar 14, 2011 at 09:58:13PM +0100, Anton Khirnov wrote:
> [...]

Why not do this for all libs instead of just libavcodec?

Diego
Anton Khirnov March 16, 2011, 8:27 p.m. | #2
On Wed, Mar 16, 2011 at 12:18:18AM +0100, Diego Biurrun wrote:
> On Mon, Mar 14, 2011 at 09:58:13PM +0100, Anton Khirnov wrote:
> > [...]
> 
> Why not do this for all libs instead of just libavcodec?

Already done in lavf, will be somewhat nontrivial in lavu (the
versioning macros depend on stringifying macros, which would have to be
split out too) and probably pointless in lavfi.

And not related to this patchset :)
Diego Biurrun March 16, 2011, 8:45 p.m. | #3
On Wed, Mar 16, 2011 at 09:27:17PM +0100, Anton Khirnov wrote:
> On Wed, Mar 16, 2011 at 12:18:18AM +0100, Diego Biurrun wrote:
> > On Mon, Mar 14, 2011 at 09:58:13PM +0100, Anton Khirnov wrote:
> > > [...]
> > 
> > Why not do this for all libs instead of just libavcodec?
> 
> Already done in lavf, will be somewhat nontrivial in lavu (the
> versioning macros depend on stringifying macros, which would have to be
> split out too) and probably pointless in lavfi.
> 
> And not related to this patchset :)

OK, patch fine with me then.  If you feel like it, go ahead with
other libs or remind me when I'm back from vacation.

Diego
Ronald Bultje March 23, 2011, 1:48 a.m. | #4
Hi,

On Wed, Mar 16, 2011 at 4:45 PM, Diego Biurrun <diego@biurrun.de> wrote:
> On Wed, Mar 16, 2011 at 09:27:17PM +0100, Anton Khirnov wrote:
>> On Wed, Mar 16, 2011 at 12:18:18AM +0100, Diego Biurrun wrote:
>> > On Mon, Mar 14, 2011 at 09:58:13PM +0100, Anton Khirnov wrote:
>> > > [...]
>> >
>> > Why not do this for all libs instead of just libavcodec?
>>
>> Already done in lavf, will be somewhat nontrivial in lavu (the
>> versioning macros depend on stringifying macros, which would have to be
>> split out too) and probably pointless in lavfi.
>>
>> And not related to this patchset :)
>
> OK, patch fine with me then.  If you feel like it, go ahead with
> other libs or remind me when I'm back from vacation.

Patch queued.

Ronald

Patch

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 930affb..9699602 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -3,7 +3,7 @@  include $(SUBDIR)../config.mak
 NAME = avcodec
 FFLIBS = avutil
 
-HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h xvmc.h
+HEADERS = avcodec.h avfft.h dxva2.h opt.h vaapi.h vdpau.h version.h xvmc.h
 
 OBJS = allcodecs.o                                                      \
        audioconvert.o                                                   \
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d323e66..dc544c3 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -31,57 +31,7 @@ 
 #include "libavutil/avutil.h"
 #include "libavutil/cpu.h"
 
-#define LIBAVCODEC_VERSION_MAJOR 52
-#define LIBAVCODEC_VERSION_MINOR 113
-#define LIBAVCODEC_VERSION_MICRO  2
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-/**
- * Those FF_API_* defines are not part of public API.
- * They may change, break or disappear at any time.
- */
-#ifndef FF_API_PALETTE_CONTROL
-#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
-#endif
-#ifndef FF_API_MM_FLAGS
-#define FF_API_MM_FLAGS         (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OPT_SHOW
-#define FF_API_OPT_SHOW         (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AUDIO_OLD
-#define FF_API_AUDIO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_VIDEO_OLD
-#define FF_API_VIDEO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_SUBTITLE_OLD
-#define FF_API_SUBTITLE_OLD     (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_USE_LPC
-#define FF_API_USE_LPC          (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_SET_STRING_OLD
-#define FF_API_SET_STRING_OLD   (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_INOFFICIAL
-#define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OLD_SAMPLE_FMT
-#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OLD_AUDIOCONVERT
-#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 53)
-#endif
+#include "libavcodec/version.h"
 
 #if LIBAVCODEC_VERSION_MAJOR < 53
 #   define FF_INTERNALC_MEM_TYPE unsigned int
diff --git a/libavcodec/version.h b/libavcodec/version.h
new file mode 100644
index 0000000..591f009
--- /dev/null
+++ b/libavcodec/version.h
@@ -0,0 +1,75 @@ 
+/*
+ *
+ * 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_VERSION_H
+#define AVCODEC_VERSION_H
+
+#define LIBAVCODEC_VERSION_MAJOR 52
+#define LIBAVCODEC_VERSION_MINOR 113
+#define LIBAVCODEC_VERSION_MICRO  2
+
+#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
+                                               LIBAVCODEC_VERSION_MINOR, \
+                                               LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
+                                           LIBAVCODEC_VERSION_MINOR,    \
+                                           LIBAVCODEC_VERSION_MICRO)
+#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
+
+#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
+
+/**
+ * Those FF_API_* defines are not part of public API.
+ * They may change, break or disappear at any time.
+ */
+#ifndef FF_API_PALETTE_CONTROL
+#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
+#endif
+#ifndef FF_API_MM_FLAGS
+#define FF_API_MM_FLAGS         (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_OPT_SHOW
+#define FF_API_OPT_SHOW         (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_AUDIO_OLD
+#define FF_API_AUDIO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_VIDEO_OLD
+#define FF_API_VIDEO_OLD        (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_SUBTITLE_OLD
+#define FF_API_SUBTITLE_OLD     (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_USE_LPC
+#define FF_API_USE_LPC          (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_SET_STRING_OLD
+#define FF_API_SET_STRING_OLD   (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_INOFFICIAL
+#define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_OLD_SAMPLE_FMT
+#define FF_API_OLD_SAMPLE_FMT   (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_OLD_AUDIOCONVERT
+#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 53)
+#endif
+
+#endif /* AVCODEC_VERSION_H */