MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'

Browse Source 
* commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4':
  oggparsevorbis: export replaygain tags from Vorbis comments

Conflicts:
	libavformat/Makefile
	libavformat/oggparsevorbis.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-04 23:17:33 +02:00
commit 849a8c4cdb
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/Makefile
View File

@ -267,6 +267,7 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \
oggparsetheora.o \
oggparsevorbis.o \
oggparsevp8.o \
replaygain.o \
vorbiscomment.o \
flac_picture.o
OBJS-$(CONFIG_OGG_MUXER) += oggenc.o \

9
libavformat/oggparsevorbis.c
View File

@ -36,6 +36,7 @@
#include "internal.h"
#include "oggdec.h"
#include "vorbiscomment.h"
#include "replaygain.h"
static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
{
@ -348,8 +349,14 @@ static int vorbis_header(AVFormatContext *s, int idx)
}
} else if (os->buf[os->pstart] == 3) {
if (vorbis_update_metadata(s, idx) >= 0 && priv->len[1] > 10) {
unsigned new_len;
int ret = ff_replaygain_export(st, st->metadata);
if (ret < 0)
return ret;
// drop all metadata we parsed and which is not required by libvorbis
unsigned new_len = 7 + 4 + AV_RL32(priv->packet[1] + 7) + 4 + 1;
new_len = 7 + 4 + AV_RL32(priv->packet[1] + 7) + 4 + 1;
if (new_len >= 16 && new_len < os->psize) {
AV_WL32(priv->packet[1] + new_len - 5, 0);
priv->packet[1][new_len - 1] = 1;