[FFmpeg-cvslog] mpegaudio: remove unused version of SAME_HEADER_MASK
Mans Rullgard
git at videolan.org
Fri May 20 06:00:41 CEST 2011
ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Thu May 19 14:01:11 2011 +0100| [c2a16e44f8ed130c2b492f1f3ce09f7f55a7d4a4] | committer: Mans Rullgard
mpegaudio: remove unused version of SAME_HEADER_MASK
Signed-off-by: Mans Rullgard <mans at mansr.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c2a16e44f8ed130c2b492f1f3ce09f7f55a7d4a4
---
libavcodec/mpegaudio.h | 4 ----
libavcodec/mpegaudio_parser.c | 1 -
2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index 5929db8..a46ecc5 100644
--- 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 3bf1a18..7cfd107 100644
--- 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))
More information about the ffmpeg-cvslog
mailing list