[FFmpeg-cvslog] lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.

Clément Bœsch git at videolan.org
Sun Feb 17 13:09:04 CET 2013


ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Sun Feb 17 13:08:30 2013 +0100| [b1e6b144ed9247ed6371fe1cbfa8ce0df25e3f48] | committer: Clément Bœsch

lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b1e6b144ed9247ed6371fe1cbfa8ce0df25e3f48
---

 libavcodec/utils.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index ec773a4..70475a1 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) {



More information about the ffmpeg-cvslog mailing list