X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Filbc.c;h=7a23b2f44248ea20f65da3d58fa863a06bced3dd;hb=a9a1bc56abf1fa79104996bf7b98b12ca42cd32c;hp=d4f458354522431b9ba4b1822a618ea981a948c4;hpb=039e9fe01ca27606a0ec1a944d51041541e10aab;p=ffmpeg diff --git a/libavformat/ilbc.c b/libavformat/ilbc.c index d4f45835452..7a23b2f4424 100644 --- a/libavformat/ilbc.c +++ b/libavformat/ilbc.c @@ -36,7 +36,7 @@ static int ilbc_write_header(AVFormatContext *s) } enc = s->streams[0]->codec; - if (enc->codec_id != CODEC_ID_ILBC) { + if (enc->codec_id != AV_CODEC_ID_ILBC) { av_log(s, AV_LOG_ERROR, "Unsupported codec\n"); return AVERROR(EINVAL); } @@ -80,7 +80,7 @@ static int ilbc_read_header(AVFormatContext *s) st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); - st->codec->codec_id = CODEC_ID_ILBC; + st->codec->codec_id = AV_CODEC_ID_ILBC; st->codec->sample_rate = 8000; st->codec->channels = 1; st->codec->codec_type = AVMEDIA_TYPE_AUDIO; @@ -122,7 +122,7 @@ static int ilbc_read_packet(AVFormatContext *s, AVInputFormat ff_ilbc_demuxer = { .name = "ilbc", - .long_name = NULL_IF_CONFIG_SMALL("iLBC storage file format"), + .long_name = NULL_IF_CONFIG_SMALL("iLBC storage"), .read_probe = ilbc_probe, .read_header = ilbc_read_header, .read_packet = ilbc_read_packet, @@ -131,10 +131,10 @@ AVInputFormat ff_ilbc_demuxer = { AVOutputFormat ff_ilbc_muxer = { .name = "ilbc", - .long_name = NULL_IF_CONFIG_SMALL("iLBC storage file format"), + .long_name = NULL_IF_CONFIG_SMALL("iLBC storage"), .mime_type = "audio/iLBC", .extensions = "lbc", - .audio_codec = CODEC_ID_ILBC, + .audio_codec = AV_CODEC_ID_ILBC, .write_header = ilbc_write_header, .write_packet = ilbc_write_packet, .flags = AVFMT_NOTIMESTAMPS,