avdevice: Add missing header for NULL_IF_CONFIG_SMALL

[ffmpeg] / libavformat / cdg.c

diff --git a/libavformat/cdg.c b/libavformat/cdg.c
index c0adf3b917ee2861ea700fa8b9462fadb37f33e3..e6996919252f6e8cdc94f38626abe4d1651b1cf8 100644 (file)
--- a/libavformat/cdg.c
+++ b/libavformat/cdg.c
@@ -26,6 +26,10 @@
 #define CDG_COMMAND        0x09
 #define CDG_MASK           0x3F
 
+typedef struct CDGContext {
+    int got_first_packet;
+} CDGContext;
+
 static int read_header(AVFormatContext *s)
 {
     AVStream *vst;
@@ -36,20 +40,22 @@ static int read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
 
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-    vst->codec->codec_id   = CODEC_ID_CDGRAPHICS;
+    vst->codec->codec_id   = AV_CODEC_ID_CDGRAPHICS;
 
     /// 75 sectors/sec * 4 packets/sector = 300 packets/sec
     avpriv_set_pts_info(vst, 32, 1, 300);
 
     ret = avio_size(s->pb);
-    if (ret > 0)
-        vst->duration = (ret * vst->time_base.den) / (CDG_PACKET_SIZE * 300);
+    if (ret < 0)
+        return ret;
 
+    vst->duration = (ret * vst->time_base.den) / (CDG_PACKET_SIZE * 300);
     return 0;
 }
 
 static int read_packet(AVFormatContext *s, AVPacket *pkt)
 {
+    CDGContext *priv = s->priv_data;
     int ret;
 
     while (1) {
@@ -59,14 +65,20 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
         av_free_packet(pkt);
     }
 
+    if (!priv->got_first_packet) {
+        pkt->flags |= AV_PKT_FLAG_KEY;
+        priv->got_first_packet = 1;
+    }
+
     pkt->stream_index = 0;
     return ret;
 }
 
 AVInputFormat ff_cdg_demuxer = {
     .name           = "cdg",
-    .long_name      = NULL_IF_CONFIG_SMALL("CD Graphics Format"),
+    .long_name      = NULL_IF_CONFIG_SMALL("CD Graphics"),
+    .priv_data_size = sizeof(CDGContext),
     .read_header    = read_header,
     .read_packet    = read_packet,
-    .extensions = "cdg"
+    .extensions     = "cdg",
 };