From b7e64fba7f37cc0399beae844f0a5dbef9219376 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 4 May 2016 00:15:41 +0200
Subject: Reduce the scope of some variables

This avoids unused variable warnings after the next version bump.
Also drop a trace level av_log() call that is in the way.
---
 libavcodec/dvdsubdec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libavcodec/dvdsubdec.c')

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index da1a83f812..6e55a09bc2 100644
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -318,8 +318,6 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
             if (h < 0)
                 h = 0;
             if (w > 0 && h > 0) {
-                int j;
-                AVSubtitleRect *rect;
                 if (sub_header->rects) {
                     for (i = 0; i < sub_header->num_rects; i++) {
                         av_freep(&sub_header->rects[i]->data[0]);
@@ -369,11 +367,15 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
 
 #if FF_API_AVPICTURE
 FF_DISABLE_DEPRECATION_WARNINGS
+{
+                int j;
+                AVSubtitleRect *rect;
                 rect = sub_header->rects[0];
                 for (j = 0; j < 4; j++) {
                     rect->pict.data[j] = rect->data[j];
                     rect->pict.linesize[j] = rect->linesize[j];
                 }
+}
 FF_ENABLE_DEPRECATION_WARNINGS
 #endif
             }
-- 
cgit v1.2.3