summaryrefslogtreecommitdiff
path: root/libavcodec/utils.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-02-17 13:08:30 +0100
committerClément Bœsch <ubitux@gmail.com>2013-02-17 13:08:30 +0100
commitb1e6b144ed9247ed6371fe1cbfa8ce0df25e3f48 (patch)
tree121cf0da1de0a7487bb2ccd728571c6ac064c485 /libavcodec/utils.c
parent90fb3e9bee600495fb5848ebb78f7c358501de6c (diff)
lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.
Diffstat (limited to 'libavcodec/utils.c')
-rw-r--r--libavcodec/utils.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ec773a4df4..70475a15e4 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1963,16 +1963,16 @@ int avcodec_decode_subtitle2(AVCodecContext *avctx, AVSubtitle *sub,
if (ret < 0) {
*got_sub_ptr = 0;
} else {
- avctx->pkt = &pkt_recoded;
-
- if (avctx->pkt_timebase.den && avpkt->pts != AV_NOPTS_VALUE)
- sub->pts = av_rescale_q(avpkt->pts,
- avctx->pkt_timebase, AV_TIME_BASE_Q);
- ret = avctx->codec->decode(avctx, sub, got_sub_ptr, &pkt_recoded);
- if (tmp.data != pkt_recoded.data)
- av_free(pkt_recoded.data);
- sub->format = !(avctx->codec_descriptor->props & AV_CODEC_PROP_BITMAP_SUB);
- avctx->pkt = NULL;
+ avctx->pkt = &pkt_recoded;
+
+ if (avctx->pkt_timebase.den && avpkt->pts != AV_NOPTS_VALUE)
+ sub->pts = av_rescale_q(avpkt->pts,
+ avctx->pkt_timebase, AV_TIME_BASE_Q);
+ ret = avctx->codec->decode(avctx, sub, got_sub_ptr, &pkt_recoded);
+ if (tmp.data != pkt_recoded.data)
+ av_free(pkt_recoded.data);
+ sub->format = !(avctx->codec_descriptor->props & AV_CODEC_PROP_BITMAP_SUB);
+ avctx->pkt = NULL;
}
if (did_split) {