avformat/aviobuf: End grace period of allowing 0 from read_packet

[ffmpeg] / libavformat / rsoenc.c

diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c
index e34e2c64e20ca476a5d5f54f5326b81d3b066a90..780538a545d23c699762e46f5ce93cf63e942798 100644 (file)
--- a/libavformat/rsoenc.c
+++ b/libavformat/rsoenc.c
@@ -22,6 +22,7 @@
 
 #include "avformat.h"
 #include "internal.h"
+#include "rawenc.h"
 #include "riff.h"
 #include "rso.h"
 
@@ -60,14 +61,6 @@ static int rso_write_header(AVFormatContext *s)
     avio_wb16(pb, par->sample_rate);
     avio_wb16(pb, 0x0000);           /* play mode ? (0x0000 = don't loop) */
 
-    avio_flush(pb);
-
-    return 0;
-}
-
-static int rso_write_packet(AVFormatContext *s, AVPacket *pkt)
-{
-    avio_write(s->pb, pkt->data, pkt->size);
     return 0;
 }
 
@@ -105,8 +98,8 @@ AVOutputFormat ff_rso_muxer = {
     .audio_codec    =   AV_CODEC_ID_PCM_U8,
     .video_codec    =   AV_CODEC_ID_NONE,
     .write_header   =   rso_write_header,
-    .write_packet   =   rso_write_packet,
+    .write_packet   =   ff_raw_write_packet,
     .write_trailer  =   rso_write_trailer,
-    .codec_tag      =   (const AVCodecTag* const []){ff_codec_rso_tags, 0},
+    .codec_tag      =   ff_rso_codec_tags_list,
     .flags          =   AVFMT_NOTIMESTAMPS,
 };