mpegaudio: remove unused version of SAME_HEADER_MASK

Signed-off-by: Mans Rullgard <mans@mansr.com>

diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 5929db86878dd40eb80f937968363529d0ad327c..a46ecc5a9f6ac022d8b0d04f287de00b646f3e5d 100644 (file)
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -47,10 +47,6 @@
 #define MPA_DUAL    2
 #define MPA_MONO    3
 
-/* header + layer + bitrate + freq + lsf/mpeg25 */
-#define SAME_HEADER_MASK \
-   (0xffe00000 | (3 << 17) | (0xf << 12) | (3 << 10) | (3 << 19))
-
 #define MP3_MASK 0xFFFE0CCF
 
 #ifndef FRAC_BITS

diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c
index 3bf1a186363a5cfe1af6ebee2fbb2c15ba7a1cb0..7cfd107d536a7194bc15783978bea15d129d72a5 100644 (file)
--- a/libavcodec/mpegaudio_parser.c
+++ b/libavcodec/mpegaudio_parser.c
@@ -35,7 +35,6 @@ typedef struct MpegAudioParseContext {
 #define MPA_HEADER_SIZE 4
 
 /* header + layer + bitrate + freq + lsf/mpeg25 */
-#undef SAME_HEADER_MASK /* mpegaudio.h defines different version */
 #define SAME_HEADER_MASK \
    (0xffe00000 | (3 << 17) | (3 << 10) | (3 << 19))