virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-24 17:12:34 +02:00
Code Issues Releases Activity

flvdec: Rename FLV_STREAM_TYPE_DATA into FLV_STREAM_TYPE_SUBTITLE

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

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2018-10-05 16:11:08 +03:00
parent 882ae091d4
commit e7ed9d81bf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/flv.h
View File

@ -65,7 +65,7 @@ enum FlvTagType {
enum { enum {
FLV_STREAM_TYPE_VIDEO, FLV_STREAM_TYPE_VIDEO,
FLV_STREAM_TYPE_AUDIO, FLV_STREAM_TYPE_AUDIO,
FLV_STREAM_TYPE_DATA, FLV_STREAM_TYPE_SUBTITLE,
FLV_STREAM_TYPE_NB, FLV_STREAM_TYPE_NB,
}; };

8
libavformat/flvdec.c
View File

@ -996,7 +996,7 @@ retry:
if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD) if ((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_VIDEO_INFO_CMD)
goto skip; goto skip;
} else if (type == FLV_TAG_TYPE_META) { } 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 if (size > 13 + 1 + 4) { // Header-type metadata stuff
int type; int type;
meta_pos = avio_tell(s->pb); meta_pos = avio_tell(s->pb);
@ -1051,7 +1051,7 @@ skip:
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO &&
(s->video_codec_id || flv_same_video_codec(st->codecpar, flags))) (s->video_codec_id || flv_same_video_codec(st->codecpar, flags)))
break; 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) if (st->codecpar->codec_type == AVMEDIA_TYPE_SUBTITLE)
break; break;
} }
@ -1151,7 +1151,7 @@ retry_duration:
if (ret < 0) if (ret < 0)
return ret; return ret;
size -= 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; st->codecpar->codec_id = AV_CODEC_ID_TEXT;
} }
@ -1253,7 +1253,7 @@ retry_duration:
if ( stream_type == FLV_STREAM_TYPE_AUDIO || if ( stream_type == FLV_STREAM_TYPE_AUDIO ||
((flags & FLV_VIDEO_FRAMETYPE_MASK) == FLV_FRAME_KEY) || ((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; pkt->flags |= AV_PKT_FLAG_KEY;
leave: leave: