Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
15c5a8d2
Commit
15c5a8d2
authored
Feb 19, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mp3dec: export replaygain tags from ID3v2
parent
06c3cd3c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
Changelog
Changelog
+1
-0
Makefile
libavformat/Makefile
+1
-1
mp3dec.c
libavformat/mp3dec.c
+7
-0
No files found.
Changelog
View file @
15c5a8d2
...
@@ -4,6 +4,7 @@ releases are sorted from youngest to oldest.
...
@@ -4,6 +4,7 @@ releases are sorted from youngest to oldest.
version <next>:
version <next>:
- libx265 encoder
- libx265 encoder
- shuffleplanes filter
- shuffleplanes filter
- replaygain data export
version 10:
version 10:
...
...
libavformat/Makefile
View file @
15c5a8d2
...
@@ -182,7 +182,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o
...
@@ -182,7 +182,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o isom.o mov_chan.o
OBJS-$(CONFIG_MOV_MUXER)
+=
movenc.o
isom.o
avc.o
hevc.o
\
OBJS-$(CONFIG_MOV_MUXER)
+=
movenc.o
isom.o
avc.o
hevc.o
\
movenchint.o
mov_chan.o
movenchint.o
mov_chan.o
OBJS-$(CONFIG_MP2_MUXER)
+=
mp3enc.o
rawenc.o
id3v2enc.o
OBJS-$(CONFIG_MP2_MUXER)
+=
mp3enc.o
rawenc.o
id3v2enc.o
OBJS-$(CONFIG_MP3_DEMUXER)
+=
mp3dec.o
OBJS-$(CONFIG_MP3_DEMUXER)
+=
mp3dec.o
replaygain.o
OBJS-$(CONFIG_MP3_MUXER)
+=
mp3enc.o
rawenc.o
id3v2enc.o
OBJS-$(CONFIG_MP3_MUXER)
+=
mp3enc.o
rawenc.o
id3v2enc.o
OBJS-$(CONFIG_MPC_DEMUXER)
+=
mpc.o
apetag.o
img2.o
OBJS-$(CONFIG_MPC_DEMUXER)
+=
mpc.o
apetag.o
img2.o
OBJS-$(CONFIG_MPC8_DEMUXER)
+=
mpc8.o
apetag.o
img2.o
OBJS-$(CONFIG_MPC8_DEMUXER)
+=
mpc8.o
apetag.o
img2.o
...
...
libavformat/mp3dec.c
View file @
15c5a8d2
...
@@ -27,6 +27,8 @@
...
@@ -27,6 +27,8 @@
#include "internal.h"
#include "internal.h"
#include "id3v2.h"
#include "id3v2.h"
#include "id3v1.h"
#include "id3v1.h"
#include "replaygain.h"
#include "libavcodec/mpegaudiodecheader.h"
#include "libavcodec/mpegaudiodecheader.h"
#define XING_FLAG_FRAMES 0x01
#define XING_FLAG_FRAMES 0x01
...
@@ -194,6 +196,7 @@ static int mp3_read_header(AVFormatContext *s)
...
@@ -194,6 +196,7 @@ static int mp3_read_header(AVFormatContext *s)
{
{
AVStream
*
st
;
AVStream
*
st
;
int64_t
off
;
int64_t
off
;
int
ret
;
st
=
avformat_new_stream
(
s
,
NULL
);
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
if
(
!
st
)
...
@@ -215,6 +218,10 @@ static int mp3_read_header(AVFormatContext *s)
...
@@ -215,6 +218,10 @@ static int mp3_read_header(AVFormatContext *s)
if
(
mp3_parse_vbr_tags
(
s
,
st
,
off
)
<
0
)
if
(
mp3_parse_vbr_tags
(
s
,
st
,
off
)
<
0
)
avio_seek
(
s
->
pb
,
off
,
SEEK_SET
);
avio_seek
(
s
->
pb
,
off
,
SEEK_SET
);
ret
=
ff_replaygain_export
(
st
,
s
->
metadata
);
if
(
ret
<
0
)
return
ret
;
/* the parameters will be extracted from the compressed bitstream */
/* the parameters will be extracted from the compressed bitstream */
return
0
;
return
0
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment