[FFmpeg-cvslog] mp3dec: use named constants for Xing header flags

Anton Khirnov git at videolan.org
Thu Sep 20 22:07:38 CEST 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Sep  2 00:30:41 2012 +0200| [2d1a1a7f62623ff153184dc75dd9559d93b76619] | committer: Anton Khirnov

mp3dec: use named constants for Xing header flags

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d1a1a7f62623ff153184dc75dd9559d93b76619
---

 libavformat/mp3dec.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index d81d0fc..ffc1c35 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -29,6 +29,9 @@
 #include "id3v1.h"
 #include "libavcodec/mpegaudiodecheader.h"
 
+#define XING_FLAG_FRAMES 0x01
+#define XING_FLAG_SIZE   0x02
+
 /* mp3 read */
 
 static int mp3_read_probe(AVProbeData *p)
@@ -117,9 +120,9 @@ static int mp3_parse_vbr_tags(AVFormatContext *s, AVStream *st, int64_t base)
     v = avio_rb32(s->pb);
     if(v == MKBETAG('X', 'i', 'n', 'g') || v == MKBETAG('I', 'n', 'f', 'o')) {
         v = avio_rb32(s->pb);
-        if(v & 0x1)
+        if(v & XING_FLAG_FRAMES)
             frames = avio_rb32(s->pb);
-        if(v & 0x2)
+        if(v & XING_FLAG_SIZE)
             size = avio_rb32(s->pb);
     }
 



More information about the ffmpeg-cvslog mailing list