OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9bf4121
)
mp3dec: use named constants for Xing header flags
author
Anton Khirnov
<anton@khirnov.net>
Sat, 1 Sep 2012 22:30:41 +0000
(
00:30
+0200)
committer
Anton Khirnov
<anton@khirnov.net>
Wed, 19 Sep 2012 18:59:44 +0000
(20:59 +0200)
libavformat/mp3dec.c
patch
|
blob
|
history
diff --git
a/libavformat/mp3dec.c
b/libavformat/mp3dec.c
index
d81d0fc
..
ffc1c35
100644
(file)
--- 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);
}