fate/mp3: use the f32le format as output

[ffmpeg] / libavformat / idroqenc.c

diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c
index 8859c98a93243b60f67de9eb9b77b489b6447485..2ce4d7d4937903f9786a17e780647a5560f38b99 100644 (file)
--- a/libavformat/idroqenc.c
+++ b/libavformat/idroqenc.c
@@ -2,20 +2,20 @@
  * id RoQ (.roq) File muxer
  * Copyright (c) 2007 Vitor Sessak
  *
- * 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
  */
 
@@ -29,21 +29,18 @@ static int roq_write_header(struct AVFormatContext *s)
         0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
     };
 
-    put_buffer(s->pb, header, 8);
-    put_flush_packet(s->pb);
+    avio_write(s->pb, header, 8);
+    avio_flush(s->pb);
 
     return 0;
 }
 
-AVOutputFormat ff_roq_muxer =
-{
-    "RoQ",
-    NULL_IF_CONFIG_SMALL("raw id RoQ format"),
-    NULL,
-    "roq",
-    0,
-    CODEC_ID_ROQ_DPCM,
-    CODEC_ID_ROQ,
-    roq_write_header,
-    ff_raw_write_packet,
+AVOutputFormat ff_roq_muxer = {
+    .name         = "roq",
+    .long_name    = NULL_IF_CONFIG_SMALL("raw id RoQ"),
+    .extensions   = "roq",
+    .audio_codec  = AV_CODEC_ID_ROQ_DPCM,
+    .video_codec  = AV_CODEC_ID_ROQ,
+    .write_header = roq_write_header,
+    .write_packet = ff_raw_write_packet,
 };