bktr: Use memset(0) instead of zero initialization for struct sigaction

[ffmpeg] / libavformat / assenc.c

diff --git a/libavformat/assenc.c b/libavformat/assenc.c
index 9b854ec0fe510496fdf65dc5abc5dcd95f187b0c..c6f9851c3b8d32a2291caa27ca086e9bc8dfcf91 100644 (file)
--- a/libavformat/assenc.c
+++ b/libavformat/assenc.c
@@ -2,20 +2,20 @@
  * SSA/ASS muxer
  * Copyright (c) 2008 Michael Niedermayer
  *
- * 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
  */
 
@@ -28,21 +28,21 @@ typedef struct ASSContext{
 static int write_header(AVFormatContext *s)
 {
     ASSContext *ass = s->priv_data;
-    AVCodecContext *avctx= s->streams[0]->codec;
+    AVCodecParameters *par = s->streams[0]->codecpar;
     uint8_t *last= NULL;
 
-    if(s->nb_streams != 1 || avctx->codec_id != CODEC_ID_SSA){
+    if(s->nb_streams != 1 || par->codec_id != AV_CODEC_ID_SSA){
         av_log(s, AV_LOG_ERROR, "Exactly one ASS/SSA stream is needed.\n");
         return -1;
     }
 
-    while(ass->extra_index < avctx->extradata_size){
-        uint8_t *p  = avctx->extradata + ass->extra_index;
+    while(ass->extra_index < par->extradata_size){
+        uint8_t *p  = par->extradata + ass->extra_index;
         uint8_t *end= strchr(p, '\n');
-        if(!end) end= avctx->extradata + avctx->extradata_size;
+        if(!end) end= par->extradata + par->extradata_size;
         else     end++;
 
-        put_buffer(s->pb, p, end-p);
+        avio_write(s->pb, p, end-p);
         ass->extra_index += end-p;
 
         if(last && !memcmp(last, "[Events]", 8))
@@ -50,43 +50,37 @@ static int write_header(AVFormatContext *s)
         last=p;
     }
 
-    put_flush_packet(s->pb);
+    avio_flush(s->pb);
 
     return 0;
 }
 
 static int write_packet(AVFormatContext *s, AVPacket *pkt)
 {
-    put_buffer(s->pb, pkt->data, pkt->size);
-
-    put_flush_packet(s->pb);
-
+    avio_write(s->pb, pkt->data, pkt->size);
     return 0;
 }
 
 static int write_trailer(AVFormatContext *s)
 {
     ASSContext *ass = s->priv_data;
-    AVCodecContext *avctx= s->streams[0]->codec;
-
-    put_buffer(s->pb, avctx->extradata      + ass->extra_index,
-                      avctx->extradata_size - ass->extra_index);
+    AVCodecParameters *par = s->streams[0]->codecpar;
 
-    put_flush_packet(s->pb);
+    avio_write(s->pb, par->extradata      + ass->extra_index,
+                      par->extradata_size - ass->extra_index);
 
     return 0;
 }
 
-AVOutputFormat ass_muxer = {
-    "ass",
-    NULL_IF_CONFIG_SMALL("Advanced SubStation Alpha subtitle format"),
-    "text/x-ssa",
-    "ass,ssa",
-    sizeof(ASSContext),
-    CODEC_ID_NONE,
-    CODEC_ID_NONE,
-    write_header,
-    write_packet,
-    write_trailer,
-    .flags = AVFMT_GLOBALHEADER | AVFMT_NOTIMESTAMPS
+AVOutputFormat ff_ass_muxer = {
+    .name           = "ass",
+    .long_name      = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
+    .mime_type      = "text/x-ssa",
+    .extensions     = "ass,ssa",
+    .priv_data_size = sizeof(ASSContext),
+    .subtitle_codec = AV_CODEC_ID_SSA,
+    .write_header   = write_header,
+    .write_packet   = write_packet,
+    .write_trailer  = write_trailer,
+    .flags          = AVFMT_GLOBALHEADER | AVFMT_NOTIMESTAMPS,
 };