virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavf/aacdec: add support for reading ape tags

Browse Source 
Closes #2634.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2013-06-03 22:16:02 +00:00
parent 55121f3fa9
commit d19d679e4b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/Makefile
View File

@@ -50,7 +50,7 @@ OBJS-$(CONFIG_SHARED) += log2_tab.o
# muxers/demuxers # muxers/demuxers
OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o
OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o rawdec.o OBJS-$(CONFIG_AAC_DEMUXER) += aacdec.o apetag.o rawdec.o
OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o OBJS-$(CONFIG_AC3_DEMUXER) += ac3dec.o rawdec.o
OBJS-$(CONFIG_AC3_MUXER) += rawenc.o OBJS-$(CONFIG_AC3_MUXER) += rawenc.o
OBJS-$(CONFIG_ACT_DEMUXER) += act.o OBJS-$(CONFIG_ACT_DEMUXER) += act.o

8
libavformat/aacdec.c
View File

@@ -25,7 +25,7 @@
#include "internal.h" #include "internal.h"
#include "rawdec.h" #include "rawdec.h"
#include "id3v1.h" #include "id3v1.h"
#include "apetag.h"
static int adts_aac_probe(AVProbeData *p) static int adts_aac_probe(AVProbeData *p)
{ {
@@ -75,6 +75,12 @@ static int adts_aac_read_header(AVFormatContext *s)
st->need_parsing = AVSTREAM_PARSE_FULL_RAW; st->need_parsing = AVSTREAM_PARSE_FULL_RAW;
ff_id3v1_read(s); ff_id3v1_read(s);
if (s->pb->seekable &&
!av_dict_get(s->metadata, "", NULL, AV_DICT_IGNORE_SUFFIX)) {
int64_t cur = avio_tell(s->pb);
ff_ape_parse_tag(s);
avio_seek(s->pb, cur, SEEK_SET);
}
//LCM of all possible ADTS sample rates //LCM of all possible ADTS sample rates
avpriv_set_pts_info(st, 64, 1, 28224000); avpriv_set_pts_info(st, 64, 1, 28224000);