Move av_tempfile() into libavutil, it is a generically usefull thing and its small.

[ffmpeg] / libavformat / act.c

diff --git a/libavformat/act.c b/libavformat/act.c
index a89fae75bef4ceea09d8fd7a6338b44ff04a1a5d..8454cd1fc04c04d93063758110c28e14d4e89b85 100644 (file)
--- a/libavformat/act.c
+++ b/libavformat/act.c
@@ -1,5 +1,5 @@
 /*
- * ACT file format muxer/demuxer
+ * ACT file format demuxer
  * Copyright (c) 2007-2008 Vladimir Voroshilov
  *
  * This file is part of FFmpeg.
@@ -83,7 +83,7 @@ static int read_header(AVFormatContext *s,
     */
     if (st->codec->sample_rate != 8000) {
         av_log(s, AV_LOG_ERROR, "Sample rate %d is not supported.\n", st->codec->sample_rate);
-        return AVERROR_NOFMT;
+        return AVERROR_INVALIDDATA;
     }
 
     st->codec->frame_size=80;
@@ -198,10 +198,10 @@ static int read_packet(AVFormatContext *s,
 }
 
 AVInputFormat ff_act_demuxer = {
-    "act",
-    "ACT Voice file format",
-    sizeof(ACTContext),
-    probe,
-    read_header,
-    read_packet
+    .name           = "act",
+    .long_name      = "ACT Voice file format",
+    .priv_data_size = sizeof(ACTContext),
+    .read_probe     = probe,
+    .read_header    = read_header,
+    .read_packet    = read_packet,
 };