X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fa64.c;h=fdd6f62750e651b85d3925c6e436b7321fd50510;hb=90bc423212396e96a02edc1118982ab7f7766a63;hp=32ed00b0632929937adb34e1b2aad12d8a76e6eb;hpb=bb07ab7cf22e7bf0717264f9e7b15dfb6d67e391;p=ffmpeg

diff --git a/libavformat/a64.c b/libavformat/a64.c
index 32ed00b0632..fdd6f62750e 100644
--- a/libavformat/a64.c
+++ b/libavformat/a64.c
@@ -2,20 +2,20 @@
  * a64 muxer
  * Copyright (c) 2009 Tobias Bindhammer
  *
- * 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
  */
 
@@ -23,10 +23,11 @@
 #include "libavcodec/a64enc.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
+#include "rawenc.h"
 
-static int a64_write_header(struct AVFormatContext *s)
+static int a64_write_header(AVFormatContext *s)
 {
-    AVCodecContext *avctx=s->streams[0]->codec;
+    AVCodecParameters *par = s->streams[0]->codecpar;
     uint8_t header[5] = {
         0x00, //load
         0x40, //address
@@ -34,39 +35,35 @@ static int a64_write_header(struct AVFormatContext *s)
         0x00, //charset_lifetime (multi only)
         0x00  //fps in 50/fps;
     };
-    switch (avctx->codec->id) {
-    case CODEC_ID_A64_MULTI:
+
+    if (par->extradata_size < 4) {
+        av_log(s, AV_LOG_ERROR, "Missing extradata\n");
+        return AVERROR_INVALIDDATA;
+    }
+
+    switch (par->codec_id) {
+    case AV_CODEC_ID_A64_MULTI:
         header[2] = 0x00;
-        header[3] = 4;
+        header[3] = AV_RB32(par->extradata+0);
         header[4] = 2;
         break;
-    case CODEC_ID_A64_MULTI5:
+    case AV_CODEC_ID_A64_MULTI5:
         header[2] = 0x01;
-        header[3] = 4;
+        header[3] = AV_RB32(par->extradata+0);
         header[4] = 3;
         break;
     default:
-        return AVERROR(EINVAL);
-        break;
+        return AVERROR_INVALIDDATA;
     }
-    put_buffer(s->pb, header, 2);
-    return 0;
-}
-
-static int a64_write_packet(struct AVFormatContext *s, AVPacket *pkt)
-{
-    put_buffer(s->pb, pkt->data, pkt->size);
-    put_flush_packet(s->pb);
+    avio_write(s->pb, header, 2);
     return 0;
 }
 
-AVOutputFormat a64_muxer = {
-    .name = "a64",
-    .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
-    .mime_type = NULL,
-    .extensions = "a64, A64",
-    .priv_data_size = sizeof (A64Context),
-    .video_codec = CODEC_ID_A64_MULTI,
-    a64_write_header,
-    a64_write_packet,
+AVOutputFormat ff_a64_muxer = {
+    .name           = "a64",
+    .long_name      = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
+    .extensions     = "a64, A64",
+    .video_codec    = AV_CODEC_ID_A64_MULTI,
+    .write_header   = a64_write_header,
+    .write_packet   = ff_raw_write_packet,
 };