Revision 6612d8cf libavformat/aacdec.c

View differences:

libavformat/aacdec.c
23 23
#include "libavutil/intreadwrite.h"
24 24
#include "avformat.h"
25 25
#include "rawdec.h"
26
#include "id3v2.h"
27 26
#include "id3v1.h"
28 27

  
29 28

  
......
36 35
    uint8_t *buf;
37 36
    uint8_t *end = buf0 + p->buf_size - 7;
38 37

  
39
    if (ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC)) {
40
        buf0 += ff_id3v2_tag_len(buf0);
41
    }
42 38
    buf = buf0;
43 39

  
44 40
    for(; buf < end; buf= buf2+1) {
......
78 74
    st->need_parsing = AVSTREAM_PARSE_FULL;
79 75

  
80 76
    ff_id3v1_read(s);
81
    ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC);
82 77

  
83 78
    //LCM of all possible ADTS sample rates
84 79
    av_set_pts_info(st, 64, 1, 28224000);

Also available in: Unified diff