From 5872c781222d5f61b69a511ea6b024d4cab0aaf6 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Mon, 21 Nov 2011 21:14:42 +0100
Subject: cdg: skip packets that don't contain a cdg command.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
 libavformat/cdg.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'libavformat')

diff --git a/libavformat/cdg.c b/libavformat/cdg.c
index b60ea3710a..b6caa5129d 100644
--- a/libavformat/cdg.c
+++ b/libavformat/cdg.c
@@ -22,6 +22,8 @@
 #include "avformat.h"
 
 #define CDG_PACKET_SIZE    24
+#define CDG_COMMAND        0x09
+#define CDG_MASK           0x3F
 
 static int read_header(AVFormatContext *s, AVFormatParameters *ap)
 {
@@ -49,7 +51,12 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     int ret;
 
-    ret = av_get_packet(s->pb, pkt, CDG_PACKET_SIZE);
+    while (1) {
+        ret = av_get_packet(s->pb, pkt, CDG_PACKET_SIZE);
+        if (ret < 1 || (pkt->data[0] & CDG_MASK) == CDG_COMMAND)
+            break;
+        av_free_packet(pkt);
+    }
 
     pkt->stream_index = 0;
     return ret;
-- 
cgit v1.2.3