mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Define macro AV_NE() and use it in libavdevice.
Help further refactoring. Originally committed as revision 24814 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3f52a907e3
commit
4f2d2e4ed9
@ -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;
|
||||
|
@ -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,
|
||||
|
@ -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, \
|
||||
|
@ -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))
|
||||
|
Loading…
Reference in New Issue
Block a user