X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fsoxdec.c;h=4c951bbd7365b93883232606ad465c44d93fe155;hb=7427d1ca4ab202def24fc3cefc4401a351d7248c;hp=46b07b73c8dfee4cea2e53139050a992657a25e6;hpb=3b0ad040b3bffaea5c5fd36bfddd9a436bc6c9c4;p=ffmpeg diff --git a/libavformat/soxdec.c b/libavformat/soxdec.c index 46b07b73c8d..4c951bbd736 100644 --- a/libavformat/soxdec.c +++ b/libavformat/soxdec.c @@ -58,14 +58,14 @@ static int sox_read_header(AVFormatContext *s) st->codec->codec_type = AVMEDIA_TYPE_AUDIO; if (avio_rl32(pb) == SOX_TAG) { - st->codec->codec_id = CODEC_ID_PCM_S32LE; + st->codec->codec_id = AV_CODEC_ID_PCM_S32LE; header_size = avio_rl32(pb); avio_skip(pb, 8); /* sample count */ sample_rate = av_int2double(avio_rl64(pb)); st->codec->channels = avio_rl32(pb); comment_size = avio_rl32(pb); } else { - st->codec->codec_id = CODEC_ID_PCM_S32BE; + st->codec->codec_id = AV_CODEC_ID_PCM_S32BE; header_size = avio_rb32(pb); avio_skip(pb, 8); /* sample count */ sample_rate = av_int2double(avio_rb64(pb)); @@ -146,7 +146,7 @@ static int sox_read_packet(AVFormatContext *s, AVInputFormat ff_sox_demuxer = { .name = "sox", - .long_name = NULL_IF_CONFIG_SMALL("SoX native format"), + .long_name = NULL_IF_CONFIG_SMALL("SoX native"), .read_probe = sox_probe, .read_header = sox_read_header, .read_packet = sox_read_packet,