X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foggparseogm.c;h=e60769efea26f1e174fa21cf047a100c7834cd92;hb=6b3484dcbc6fe6a5f3d0919922790592c9d5a608;hp=43243f042f1203481360cbbcf63afa4c89e50159;hpb=052f4f859cfee9bb86ea3ccb0c56ea11d050ef17;p=ffmpeg diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c index 43243f042f1..e60769efea2 100644 --- a/libavformat/oggparseogm.c +++ b/libavformat/oggparseogm.c @@ -58,7 +58,7 @@ ogm_header(AVFormatContext *s, int idx) st->codec->codec_tag = tag; } else if (*p == 't') { st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE; - st->codec->codec_id = CODEC_ID_TEXT; + st->codec->codec_id = AV_CODEC_ID_TEXT; p += 12; } else { uint8_t acid[5]; @@ -70,7 +70,7 @@ ogm_header(AVFormatContext *s, int idx) cid = strtol(acid, NULL, 16); st->codec->codec_id = ff_codec_get_id(ff_codec_wav_tags, cid); // our parser completely breaks AAC in Ogg - if (st->codec->codec_id != CODEC_ID_AAC) + if (st->codec->codec_id != AV_CODEC_ID_AAC) st->need_parsing = AVSTREAM_PARSE_FULL; } @@ -91,7 +91,7 @@ ogm_header(AVFormatContext *s, int idx) st->codec->bit_rate = bytestream_get_le32(&p) * 8; st->codec->sample_rate = time_unit ? spu * 10000000 / time_unit : 0; avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate); - if (size >= 56 && st->codec->codec_id == CODEC_ID_AAC) { + if (size >= 56 && st->codec->codec_id == AV_CODEC_ID_AAC) { p += 4; size -= 4; }