X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fvc1testenc.c;h=2b0728d24841cfb5148a48b2c395bbf9e4394a9f;hb=89d4c130574c6f2a617c5fde6f9b8a82da7a1e28;hp=567efb2d3afe03f7d0db83bee73cc448877d68e1;hpb=22e9277aa5e6e5abfd037420093439058d4a14df;p=ffmpeg

diff --git a/libavformat/vc1testenc.c b/libavformat/vc1testenc.c
index 567efb2d3af..2b0728d2484 100644
--- a/libavformat/vc1testenc.c
+++ b/libavformat/vc1testenc.c
@@ -2,20 +2,20 @@
  * VC-1 test bitstreams format muxer.
  * Copyright (c) 2008 Konstantin Shishkov
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avformat.h"
@@ -27,26 +27,26 @@ typedef struct RCVContext {
 static int vc1test_write_header(AVFormatContext *s)
 {
     AVCodecContext *avc = s->streams[0]->codec;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
 
     if (avc->codec_id != CODEC_ID_WMV3) {
         av_log(s, AV_LOG_ERROR, "Only WMV3 is accepted!\n");
         return -1;
     }
-    put_le24(pb, 0); //frames count will be here
-    put_byte(pb, 0xC5);
-    put_le32(pb, 4);
-    put_buffer(pb, avc->extradata, 4);
-    put_le32(pb, avc->height);
-    put_le32(pb, avc->width);
-    put_le32(pb, 0xC);
-    put_le24(pb, 0); // hrd_buffer
-    put_byte(pb, 0x80); // level|cbr|res1
-    put_le32(pb, 0); // hrd_rate
+    avio_wl24(pb, 0); //frames count will be here
+    avio_w8(pb, 0xC5);
+    avio_wl32(pb, 4);
+    avio_write(pb, avc->extradata, 4);
+    avio_wl32(pb, avc->height);
+    avio_wl32(pb, avc->width);
+    avio_wl32(pb, 0xC);
+    avio_wl24(pb, 0); // hrd_buffer
+    avio_w8(pb, 0x80); // level|cbr|res1
+    avio_wl32(pb, 0); // hrd_rate
     if (s->streams[0]->r_frame_rate.den && s->streams[0]->r_frame_rate.num == 1)
-        put_le32(pb, s->streams[0]->r_frame_rate.den);
+        avio_wl32(pb, s->streams[0]->r_frame_rate.den);
     else
-        put_le32(pb, 0xFFFFFFFF); //variable framerate
+        avio_wl32(pb, 0xFFFFFFFF); //variable framerate
     av_set_pts_info(s->streams[0], 32, 1, 1000);
 
     return 0;
@@ -55,14 +55,14 @@ static int vc1test_write_header(AVFormatContext *s)
 static int vc1test_write_packet(AVFormatContext *s, AVPacket *pkt)
 {
     RCVContext *ctx = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
 
     if (!pkt->size)
         return 0;
-    put_le32(pb, pkt->size | ((pkt->flags & AV_PKT_FLAG_KEY) ? 0x80000000 : 0));
-    put_le32(pb, pkt->pts);
-    put_buffer(pb, pkt->data, pkt->size);
-    put_flush_packet(pb);
+    avio_wl32(pb, pkt->size | ((pkt->flags & AV_PKT_FLAG_KEY) ? 0x80000000 : 0));
+    avio_wl32(pb, pkt->pts);
+    avio_write(pb, pkt->data, pkt->size);
+    avio_flush(pb);
     ctx->frames++;
 
     return 0;
@@ -71,12 +71,12 @@ static int vc1test_write_packet(AVFormatContext *s, AVPacket *pkt)
 static int vc1test_write_trailer(AVFormatContext *s)
 {
     RCVContext *ctx = s->priv_data;
-    ByteIOContext *pb = s->pb;
+    AVIOContext *pb = s->pb;
 
-    if (!url_is_streamed(s->pb)) {
-        url_fseek(pb, 0, SEEK_SET);
-        put_le24(pb, ctx->frames);
-        put_flush_packet(pb);
+    if (s->pb->seekable) {
+        avio_seek(pb, 0, SEEK_SET);
+        avio_wl24(pb, ctx->frames);
+        avio_flush(pb);
     }
     return 0;
 }