From 4f2d2e4ed924834dea69a0ade184aa58cbec7d2e Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Tue, 17 Aug 2010 18:25:34 +0000
Subject: [PATCH] Define macro AV_NE() and use it in libavdevice.
Help further refactoring.
Originally committed as revision 24814 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavdevice/alsa-audio.h | 6 +-----
libavdevice/oss_audio.c | 6 +-----
libavutil/avutil.h | 2 +-
libavutil/common.h | 7 +++++++
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa-audio.h
index a90d5e780a9..949383157ef 100644
--- a/libavdevice/alsa-audio.h
+++ b/libavdevice/alsa-audio.h
@@ -37,11 +37,7 @@
/* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in
other formats */
-#if HAVE_BIGENDIAN
-#define DEFAULT_CODEC_ID CODEC_ID_PCM_S16BE
-#else
-#define DEFAULT_CODEC_ID CODEC_ID_PCM_S16LE
-#endif
+#define DEFAULT_CODEC_ID AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE)
typedef struct {
snd_pcm_t *h;
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index d382c0376ee..9d007108e60 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -315,11 +315,7 @@ AVOutputFormat oss_muxer = {
/* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in
other formats */
-#if HAVE_BIGENDIAN
- CODEC_ID_PCM_S16BE,
-#else
- CODEC_ID_PCM_S16LE,
-#endif
+ AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
CODEC_ID_NONE,
audio_write_header,
audio_write_packet,
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 50b29fc4a73..fdba9dee970 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -40,7 +40,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 50
-#define LIBAVUTIL_VERSION_MINOR 23
+#define LIBAVUTIL_VERSION_MINOR 24
#define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
diff --git a/libavutil/common.h b/libavutil/common.h
index f9c03db559a..e1b14dcc537 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -35,6 +35,13 @@
#include <stdlib.h>
#include <string.h>
#include "attributes.h"
+#include "avconfig.h"
+
+#if AV_HAVE_BIGENDIAN
+# define AV_NE(be, le) be
+#else
+# define AV_NE(be, le) le
+#endif
//rounded division & shift
#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
--
GitLab