flvdec: Rename FLV_STREAM_TYPE_DATA into FLV_STREAM_TYPE_SUBTITLE

This is always treated as a subtitle at the moment anyway.

Signed-off-by: Martin Storsjö <martin@martin.st>

diff --git a/libavformat/flv.h b/libavformat/flv.h
index df5ce3d17f8c78c89ff9bc782cfcebb54812167e..3aabb3adc92c889ea1309810c17a500e31f9dea5 100644 (file)
--- a/libavformat/flv.h
+++ b/libavformat/flv.h
@@ -65,7 +65,7 @@ enum FlvTagType {
 enum {
     FLV_STREAM_TYPE_VIDEO,
     FLV_STREAM_TYPE_AUDIO,
-    FLV_STREAM_TYPE_DATA,
+    FLV_STREAM_TYPE_SUBTITLE,
     FLV_STREAM_TYPE_NB,
 };
 

diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
index a2dea464e3697e517415ce8e4a1a6da009c263fc..ffc975f15d038477204e5469061c36052cc89562 100644 (file)
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -996,7 +996,7 @@ retry:
             if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD)
                 goto skip;
         } else if (type == FLV_TAG_TYPE_META) {
-            stream_type=FLV_STREAM_TYPE_DATA;
+            stream_type=FLV_STREAM_TYPE_SUBTITLE;
             if (size > 13 + 1 + 4) { // Header-type metadata stuff
                 int type;
                 meta_pos = avio_tell(s->pb);
@@ -1051,7 +1051,7 @@ skip:
                 if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
                     (s->video_codec_id || flv_same_video_codec(st->codecpar, flags)))
                     break;
-            } else if (stream_type == FLV_STREAM_TYPE_DATA) {
+            } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) {
                 if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE)
                     break;
             }
@@ -1151,7 +1151,7 @@ retry_duration:
         if (ret < 0)
             return ret;
         size -= ret;
-    } else if (stream_type == FLV_STREAM_TYPE_DATA) {
+    } else if (stream_type == FLV_STREAM_TYPE_SUBTITLE) {
         st->codecpar->codec_id = AV_CODEC_ID_TEXT;
     }
 
@@ -1253,7 +1253,7 @@ retry_duration:
 
     if (    stream_type == FLV_STREAM_TYPE_AUDIO ||
             ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) ||
-            stream_type == FLV_STREAM_TYPE_DATA)
+            stream_type == FLV_STREAM_TYPE_SUBTITLE)
         pkt->flags |= AV_PKT_FLAG_KEY;
 
 leave: