From fc8dbe211bc6d536fae8dba75c83d24ee32c93d8 Mon Sep 17 00:00:00 2001 From: Josh Allmann Date: Fri, 25 Jun 2010 14:24:58 -0700 Subject: [PATCH 1/7] Move space_chars from avformat/internal to rtpdec. --- libavformat/internal.h | 2 -- libavformat/rtpdec.h | 2 ++ libavformat/rtpdec_mpeg4.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 8a164bd..4489ffe 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -174,6 +174,4 @@ void ff_sdp_write_media(char *buff, int size, AVCodecContext *c, int ff_write_chained(AVFormatContext *dst, int dst_stream, AVPacket *pkt, AVFormatContext *src); -#define SPACE_CHARS " \t\r\n" - #endif /* AVFORMAT_INTERNAL_H */ diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 8a62034..439fcc2 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -26,6 +26,8 @@ #include "avformat.h" #include "rtp.h" +#define SPACE_CHARS " \t\r\n" + typedef struct PayloadContext PayloadContext; typedef struct RTPDynamicProtocolHandler_s RTPDynamicProtocolHandler; diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index dec45b4..cb22b32 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -28,7 +28,6 @@ */ #include "rtpdec_mpeg4.h" -#include "internal.h" #include "libavutil/avstring.h" #include "libavcodec/get_bits.h" #include -- 1.7.0.4