rtspenc: include os_support.h for system without HAVE_POLL_H

[ffmpeg] / libavformat / vc1test.c

diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c
index 531fd8515b45b96270b1597086aba734cda85cd1..8dd735dac2c26bc47c5f0c4838f1350e68f30c3a 100644 (file)
--- a/libavformat/vc1test.c
+++ b/libavformat/vc1test.c
@@ -20,19 +20,22 @@
  */
 
 /**
- * @file vc1test.c
+ * @file
  * VC1 test bitstream file demuxer
  * by Konstantin Shishkov
  * Format specified in SMPTE standard 421 Annex L
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define VC1_EXTRADATA_SIZE 4
 
 static int vc1t_probe(AVProbeData *p)
 {
-    if (p->buf[3] != 0xC5 && AV_RL32(&p->buf[4]) != 4)
+    if (p->buf_size < 24)
+        return 0;
+    if (p->buf[3] != 0xC5 || AV_RL32(&p->buf[4]) != 4 || AV_RL32(&p->buf[20]) != 0xC)
         return 0;
 
     return AVPROBE_SCORE_MAX/2;
@@ -43,7 +46,8 @@ static int vc1t_read_header(AVFormatContext *s,
 {
     ByteIOContext *pb = s->pb;
     AVStream *st;
-    int fps, frames;
+    int frames;
+    uint32_t fps;
 
     frames = get_le24(pb);
     if(get_byte(pb) != 0xC5 || get_le32(pb) != 4)
@@ -54,7 +58,7 @@ static int vc1t_read_header(AVFormatContext *s,
     if (!st)
         return -1;
 
-    st->codec->codec_type = CODEC_TYPE_VIDEO;
+    st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id = CODEC_ID_WMV3;
 
     st->codec->extradata = av_malloc(VC1_EXTRADATA_SIZE);
@@ -66,9 +70,13 @@ static int vc1t_read_header(AVFormatContext *s,
         return -1;
     url_fskip(pb, 8);
     fps = get_le32(pb);
-    if(fps == -1)
+    if(fps == 0xFFFFFFFF)
         av_set_pts_info(st, 32, 1, 1000);
     else{
+        if (!fps) {
+            av_log(s, AV_LOG_ERROR, "Zero FPS specified, defaulting to 1 FPS\n");
+            fps = 1;
+        }
         av_set_pts_info(st, 24, 1, fps);
         st->duration = frames;
     }
@@ -95,15 +103,15 @@ static int vc1t_read_packet(AVFormatContext *s,
         return AVERROR(EIO);
     if(s->streams[0]->time_base.den == 1000)
         pkt->pts = pts;
-    pkt->flags |= keyframe ? PKT_FLAG_KEY : 0;
+    pkt->flags |= keyframe ? AV_PKT_FLAG_KEY : 0;
     pkt->pos -= 8;
 
     return pkt->size;
 }
 
-AVInputFormat vc1t_demuxer = {
+AVInputFormat ff_vc1t_demuxer = {
     "vc1test",
-    "VC1 test bitstream format",
+    NULL_IF_CONFIG_SMALL("VC-1 test bitstream format"),
     0,
     vc1t_probe,
     vc1t_read_header,