diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-07-29 02:17:57 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-07-29 02:31:27 +0000 |
| commit | e4f3a9693dd003393131f8e144ef3515e93fe6cd (patch) | |
| tree | 1af2a69eb9042cfd3035b6e7428a9acc25b3e58d | |
| parent | c3c9c4d006c314c6a7d74efde260f082ce9470e6 (diff) | |
| download | ffmpeg-e4f3a9693dd003393131f8e144ef3515e93fe6cd.tar.gz | |
lavf/apetag: move common stuff between writer and reader to single file
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavformat/apetag.c | 4 | ||||
| -rw-r--r-- | libavformat/apetag.h | 4 | ||||
| -rw-r--r-- | libavformat/apetagenc.c | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/libavformat/apetag.c b/libavformat/apetag.c index 4d25a8e969..6f6a61b0ea 100644 --- a/libavformat/apetag.c +++ b/libavformat/apetag.c @@ -26,8 +26,6 @@ #include "apetag.h" #include "internal.h" -#define APE_TAG_VERSION 2000 -#define APE_TAG_FOOTER_BYTES 32 #define APE_TAG_FLAG_CONTAINS_HEADER (1 << 31) #define APE_TAG_FLAG_IS_HEADER (1 << 29) #define APE_TAG_FLAG_IS_BINARY (1 << 1) @@ -127,7 +125,7 @@ void ff_ape_parse_tag(AVFormatContext *s) avio_seek(pb, file_size - APE_TAG_FOOTER_BYTES, SEEK_SET); avio_read(pb, buf, 8); /* APETAGEX */ - if (strncmp(buf, "APETAGEX", 8)) { + if (strncmp(buf, APE_TAG_PREAMBLE, 8)) { return; } diff --git a/libavformat/apetag.h b/libavformat/apetag.h index 7727921ca8..17a9a72b19 100644 --- a/libavformat/apetag.h +++ b/libavformat/apetag.h @@ -25,6 +25,10 @@ #include "avformat.h" +#define APE_TAG_PREAMBLE "APETAGEX" +#define APE_TAG_VERSION 2000 +#define APE_TAG_FOOTER_BYTES 32 + /** * Read and parse an APE tag */ diff --git a/libavformat/apetagenc.c b/libavformat/apetagenc.c index 3fbcad1e13..42f58362a6 100644 --- a/libavformat/apetagenc.c +++ b/libavformat/apetagenc.c @@ -24,10 +24,6 @@ #include "avformat.h" #include "apetag.h" -#define APE_TAG_PREAMBLE "APETAGEX" -#define APE_TAG_VERSION 2000 -#define APE_TAG_FOOTER_BYTES 32 - static int string_is_ascii(const uint8_t *str) { while (*str && *str >= 0x20 && *str <= 0x7e ) str++; |