rmdec: remove unused variable
[ffmpeg.git] / libavformat / a64.c
index 17dcd96..c1f6b67 100644 (file)
@@ -43,19 +43,18 @@ static int a64_write_header(struct AVFormatContext *s)
     };
     c->interleaved = 0;
     switch (avctx->codec->id) {
-    case CODEC_ID_A64_MULTI:
+    case AV_CODEC_ID_A64_MULTI:
         header[2] = 0x00;
         header[3] = AV_RB32(avctx->extradata+0);
         header[4] = 2;
         break;
-    case CODEC_ID_A64_MULTI5:
+    case AV_CODEC_ID_A64_MULTI5:
         header[2] = 0x01;
         header[3] = AV_RB32(avctx->extradata+0);
         header[4] = 3;
         break;
     default:
         return AVERROR(EINVAL);
-        break;
     }
     avio_write(s->pb, header, 2);
     c->prev_pkt.size = 0;
@@ -77,8 +76,8 @@ static int a64_write_packet(struct AVFormatContext *s, AVPacket *pkt)
 
     /* fetch values from extradata */
     switch (avctx->codec->id) {
-    case CODEC_ID_A64_MULTI:
-    case CODEC_ID_A64_MULTI5:
+    case AV_CODEC_ID_A64_MULTI:
+    case AV_CODEC_ID_A64_MULTI5:
         if(c->interleaved) {
             /* Write interleaved, means we insert chunks of the future charset before each current frame.
              * Reason: if we load 1 charset + corresponding frames in one block on c64, we need to store
@@ -149,7 +148,7 @@ static int a64_write_packet(struct AVFormatContext *s, AVPacket *pkt)
         break;
     }
 
-    put_flush_packet(s->pb);
+    avio_flush(s->pb);
     return 0;
 }
 
@@ -165,13 +164,12 @@ static int a64_write_trailer(struct AVFormatContext *s)
 }
 
 AVOutputFormat ff_a64_muxer = {
-    .name = "a64",
-    .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
-    .mime_type = NULL,
-    .extensions = "a64, A64",
+    .name           = "a64",
+    .long_name      = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
+    .extensions     = "a64, A64",
     .priv_data_size = sizeof (A64Context),
-    .video_codec CODEC_ID_A64_MULTI,
-    a64_write_header,
-    a64_write_packet,
-    a64_write_trailer
+    .video_codec    = AV_CODEC_ID_A64_MULTI,
+    .write_header   = a64_write_header,
+    .write_packet   = a64_write_packet,
+    .write_trailer  = a64_write_trailer,
 };