virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

lavf/subtitles: error out in case of bitmap subtitles.

Browse Source
This commit is contained in:
Clément Bœsch
2013-02-17 13:33:52 +01:00
parent fe150a48a7
commit f3147917bf
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/vf_subtitles.c
View File

@@ -267,6 +267,7 @@ static av_cold int init_subtitles(AVFilterContext *ctx, const char *args)
AVFormatContext *fmt = NULL; AVFormatContext *fmt = NULL;
AVCodecContext *dec_ctx = NULL; AVCodecContext *dec_ctx = NULL;
AVCodec *dec = NULL; AVCodec *dec = NULL;
AVCodecDescriptor *dec_desc;
AVStream *st; AVStream *st;
AVPacket pkt; AVPacket pkt;
AssContext *ass = ctx->priv; AssContext *ass = ctx->priv;
@@ -309,6 +310,12 @@ static av_cold int init_subtitles(AVFilterContext *ctx, const char *args)
avcodec_get_name(dec_ctx->codec_id)); avcodec_get_name(dec_ctx->codec_id));
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
dec_desc = avcodec_descriptor_get(dec_ctx->codec_id);
if (dec_desc && (dec_desc->props & AV_CODEC_PROP_BITMAP_SUB)) {
av_log(ctx, AV_LOG_ERROR,
"Only text based subtitles are currently supported\n");
return AVERROR_PATCHWELCOME;
}
if (ass->charenc) if (ass->charenc)
av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0); av_dict_set(&codec_opts, "sub_charenc", ass->charenc, 0);
ret = avcodec_open2(dec_ctx, dec, &codec_opts); ret = avcodec_open2(dec_ctx, dec, &codec_opts);