aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2012-08-12 14:18:35 -0700
committerPhilip Langdale <philipl@overt.org>2012-08-15 20:46:54 -0700
commit6057de19b5e0075fea55a3a0cb9d225ba3a6f9a4 (patch)
tree0240e9ba5e109ca680013d6c4b221f4c95b7d8f6 /libavformat
parent6af680fa070ebc5081045e4b24ceaa4fccfa89b4 (diff)
downloadffmpeg-6057de19b5e0075fea55a3a0cb9d225ba3a6f9a4.tar.gz
srtenc: Add timing-less "subrip" encoder.
Unsurprisingly, if a timing-less subrip decoder is desireable, an encoder is as well. With this in place, we can move on to remove the use of the old encoder/decoder with embedded timing and move all timing handling the (de)muxer where they belong. Signed-off-by: Philip Langdale <philipl@overt.org>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/srtenc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c
index 7fe559f487..6b8278fa80 100644
--- a/libavformat/srtenc.c
+++ b/libavformat/srtenc.c
@@ -42,6 +42,7 @@ static int srt_write_header(AVFormatContext *avf)
return AVERROR(EINVAL);
}
if (avf->streams[0]->codec->codec_id != AV_CODEC_ID_TEXT &&
+ avf->streams[0]->codec->codec_id != AV_CODEC_ID_SUBRIP &&
avf->streams[0]->codec->codec_id != AV_CODEC_ID_SRT) {
av_log(avf, AV_LOG_ERROR,
"Unsupported subtitles codec: %s\n",