diff options
| -rw-r--r-- | Changelog | 2 | ||||
| -rw-r--r-- | libavformat/matroska.c | 1 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
3 files changed, 4 insertions, 1 deletions
@@ -52,6 +52,8 @@ version next: - ffmpeg -shortest option is now per-output file - volume measurement filter - Ut Video encoder +- Matroska demuxer now identifies SRT subtitles as AV_CODEC_ID_SUBRIP + instead of AV_CODEC_ID_TEXT version 0.11: diff --git a/libavformat/matroska.c b/libavformat/matroska.c index b386d7421b..b016491018 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -53,6 +53,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"A_VORBIS" , AV_CODEC_ID_VORBIS}, {"A_WAVPACK4" , AV_CODEC_ID_WAVPACK}, + {"S_TEXT/UTF8" , AV_CODEC_ID_SUBRIP}, {"S_TEXT/UTF8" , AV_CODEC_ID_TEXT}, {"S_TEXT/UTF8" , AV_CODEC_ID_SRT}, {"S_TEXT/ASCII" , AV_CODEC_ID_TEXT}, diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 41375e3ac3..1d0dbb3296 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2105,7 +2105,7 @@ static int matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, else pkt->pts = timecode; pkt->pos = pos; - if (st->codec->codec_id == AV_CODEC_ID_TEXT) + if (st->codec->codec_id == AV_CODEC_ID_SUBRIP) pkt->convergence_duration = lace_duration; else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE) pkt->duration = lace_duration; |