From 63c0113588d61d5ed045e1937c473770453c53be Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Sat, 27 Jul 2013 21:14:44 +0200 Subject: lavc: do not override format if neither text nor bitmap codec prop is set Some decoders may output both, this way the decoder can set it. Signed-off-by: Marton Balint Signed-off-by: Michael Niedermayer --- libavcodec/utils.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 50448b4a85..8464c3b8dc 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -2337,7 +2337,10 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub, av_free_packet(&pkt_recoded); } - sub->format = !(avctx->codec_descriptor->props & AV_CODEC_PROP_BITMAP_SUB); + if (avctx->codec_descriptor->props & AV_CODEC_PROP_BITMAP_SUB) + sub->format = 0; + else if (avctx->codec_descriptor->props & AV_CODEC_PROP_TEXT_SUB) + sub->format = 1; avctx->pkt = NULL; } -- cgit v1.2.3