Remove unused variables, fixes the following warnings:

[ffmpeg] / libavformat / raw.c

diff --git a/libavformat/raw.c b/libavformat/raw.c
index c1ccb621678993c39621ffde08fdbbc058a023a1..bd9380315ca6b54b1234a48967a8c8ec2fa31fdc 100644 (file)
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -21,14 +21,10 @@
  */
 #include "avformat.h"
 #include "ac3_parser.h"
+#include "raw.h"
 
 #ifdef CONFIG_MUXERS
 /* simple formats */
-static int raw_write_header(struct AVFormatContext *s)
-{
-    return 0;
-}
-
 static int flac_write_header(struct AVFormatContext *s)
 {
     static const uint8_t header[8] = {
@@ -414,12 +410,9 @@ static int ac3_probe(AVProbeData *p)
     uint8_t *buf, *buf2, *end;
     AC3HeaderInfo hdr;
 
-    if(p->buf_size < 7)
-        return 0;
-
     max_frames = 0;
     buf = p->buf;
-    end = buf + FFMIN(5120, p->buf_size - 7);
+    end = buf + p->buf_size;
 
     for(; buf < end; buf++) {
         buf2 = buf;
@@ -434,11 +427,17 @@ static int ac3_probe(AVProbeData *p)
             first_frames = frames;
     }
     if   (first_frames>=3) return AVPROBE_SCORE_MAX * 3 / 4;
-    else if(max_frames>=2) return AVPROBE_SCORE_MAX / 2;
+    else if(max_frames>=3) return AVPROBE_SCORE_MAX / 2;
     else if(max_frames>=1) return 1;
     else                   return 0;
 }
 
+static int flac_probe(AVProbeData *p)
+{
+    if(memcmp(p->buf, "fLaC", 4)) return 0;
+    else                          return AVPROBE_SCORE_MAX / 2;
+}
+
 AVInputFormat shorten_demuxer = {
     "shn",
     "raw shorten",
@@ -455,7 +454,7 @@ AVInputFormat flac_demuxer = {
     "flac",
     "raw flac",
     0,
-    NULL,
+    flac_probe,
     flac_read_header,
     raw_read_partial_packet,
     raw_read_close,
@@ -501,7 +500,7 @@ AVOutputFormat ac3_muxer = {
     0,
     CODEC_ID_AC3,
     0,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -568,7 +567,7 @@ AVOutputFormat h261_muxer = {
     0,
     0,
     CODEC_ID_H261,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -596,7 +595,7 @@ AVOutputFormat h263_muxer = {
     0,
     0,
     CODEC_ID_H263,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -624,7 +623,7 @@ AVOutputFormat m4v_muxer = {
     0,
     CODEC_ID_NONE,
     CODEC_ID_MPEG4,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -652,7 +651,7 @@ AVOutputFormat h264_muxer = {
     0,
     CODEC_ID_NONE,
     CODEC_ID_H264,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -679,7 +678,7 @@ AVOutputFormat mpeg1video_muxer = {
     0,
     0,
     CODEC_ID_MPEG1VIDEO,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -694,7 +693,7 @@ AVOutputFormat mpeg2video_muxer = {
     0,
     0,
     CODEC_ID_MPEG2VIDEO,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -735,7 +734,7 @@ AVOutputFormat mjpeg_muxer = {
     0,
     0,
     CODEC_ID_MJPEG,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -779,7 +778,7 @@ AVOutputFormat pcm_ ## name ## _muxer = {\
     0,\
     codec,\
     0,\
-    raw_write_header,\
+    NULL,\
     raw_write_packet,\
     .flags= AVFMT_NOTIMESTAMPS,\
 };
@@ -876,7 +875,7 @@ AVOutputFormat rawvideo_muxer = {
     0,
     CODEC_ID_NONE,
     CODEC_ID_RAWVIDEO,
-    raw_write_header,
+    NULL,
     raw_write_packet,
     .flags= AVFMT_NOTIMESTAMPS,
 };
@@ -900,7 +899,7 @@ AVOutputFormat null_muxer = {
     CODEC_ID_PCM_S16LE,
 #endif
     CODEC_ID_RAWVIDEO,
-    raw_write_header,
+    NULL,
     null_write_packet,
     .flags = AVFMT_NOFILE | AVFMT_RAWPICTURE | AVFMT_NOTIMESTAMPS,
 };