X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frsoenc.c;h=8ebcf8193b7c0d309ef777d8376a4f8f39009fa0;hb=cc8db760616a7ec3bd39b22ca45888c01326db13;hp=eabb2d563521333074d302480c82c1c489d31a61;hpb=6774247a9d7d15033c2b80118c03cb0cb10027df;p=ffmpeg diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c index eabb2d56352..8ebcf8193b7 100644 --- a/libavformat/rsoenc.c +++ b/libavformat/rsoenc.c @@ -49,7 +49,7 @@ static int rso_write_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV) { + if (enc->codec_id == AV_CODEC_ID_ADPCM_IMA_WAV) { av_log(s, AV_LOG_ERROR, "ADPCM in RSO not implemented\n"); return AVERROR_PATCHWELCOME; } @@ -95,8 +95,6 @@ static int rso_write_trailer(AVFormatContext *s) avio_wb16(pb, coded_file_size); avio_seek(pb, file_size, SEEK_SET); - avio_flush(pb); - return 0; } @@ -104,10 +102,11 @@ AVOutputFormat ff_rso_muxer = { .name = "rso", .long_name = NULL_IF_CONFIG_SMALL("Lego Mindstorms RSO"), .extensions = "rso", - .audio_codec = CODEC_ID_PCM_U8, - .video_codec = CODEC_ID_NONE, + .audio_codec = AV_CODEC_ID_PCM_U8, + .video_codec = AV_CODEC_ID_NONE, .write_header = rso_write_header, .write_packet = rso_write_packet, .write_trailer = rso_write_trailer, .codec_tag = (const AVCodecTag* const []){ff_codec_rso_tags, 0}, + .flags = AVFMT_NOTIMESTAMPS, };