Merge remote-tracking branch 'newdev/master'

[ffmpeg] / libavformat / rsoenc.c

diff --git a/libavformat/rsoenc.c b/libavformat/rsoenc.c
index 7b138986971042a1148e527945a538973644bf98..58cfc798c9347ce0326532d5c2d9846c236877f8 100644 (file)
--- a/libavformat/rsoenc.c
+++ b/libavformat/rsoenc.c
@@ -27,7 +27,7 @@
 
 static int rso_write_header(AVFormatContext *s)
 {
-    ByteIOContext  *pb  = s->pb;
+    AVIOContext  *pb  = s->pb;
     AVCodecContext *enc = s->streams[0]->codec;
 
     if (!enc->codec_tag)
@@ -55,29 +55,29 @@ static int rso_write_header(AVFormatContext *s)
     }
 
     /* format header */
-    put_be16(pb, enc->codec_tag);   /* codec ID */
-    put_be16(pb, 0);                /* data size, will be written at EOF */
-    put_be16(pb, enc->sample_rate);
-    put_be16(pb, 0x0000);           /* play mode ? (0x0000 = don't loop) */
+    avio_wb16(pb, enc->codec_tag);   /* codec ID */
+    avio_wb16(pb, 0);                /* data size, will be written at EOF */
+    avio_wb16(pb, enc->sample_rate);
+    avio_wb16(pb, 0x0000);           /* play mode ? (0x0000 = don't loop) */
 
-    put_flush_packet(pb);
+    avio_flush(pb);
 
     return 0;
 }
 
 static int rso_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    put_buffer(s->pb, pkt->data, pkt->size);
+    avio_write(s->pb, pkt->data, pkt->size);
     return 0;
 }
 
 static int rso_write_trailer(AVFormatContext *s)
 {
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
     int64_t file_size;
     uint16_t coded_file_size;
 
-    file_size = url_ftell(pb);
+    file_size = avio_tell(pb);
 
     if (file_size < 0)
         return file_size;
@@ -91,11 +91,11 @@ static int rso_write_trailer(AVFormatContext *s)
     }
 
     /* update file size */
-    url_fseek(pb, 2, SEEK_SET);
-    put_be16(pb, coded_file_size);
-    url_fseek(pb, file_size, SEEK_SET);
+    avio_seek(pb, 2, SEEK_SET);
+    avio_wb16(pb, coded_file_size);
+    avio_seek(pb, file_size, SEEK_SET);
 
-    put_flush_packet(pb);
+    avio_flush(pb);
 
     return 0;
 }