[FFmpeg-cvslog] avcodec/dvbsubdec: merge declaration and init

Michael Niedermayer git at videolan.org
Fri Oct 31 00:06:14 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 30 23:28:15 2014 +0100| [25a360286db80b411377b290baa466178070c007] | committer: Michael Niedermayer

avcodec/dvbsubdec: merge declaration and init

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/dvbsubdec.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index 097597e..c0a3790 100644
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -327,10 +327,8 @@ static void delete_region_display_list(DVBSubContext *ctx, DVBSubRegion *region)
 
 static void delete_cluts(DVBSubContext *ctx)
 {
-    DVBSubCLUT *clut;
-
     while (ctx->clut_list) {
-        clut = ctx->clut_list;
+        DVBSubCLUT *clut = ctx->clut_list;
 
         ctx->clut_list = clut->next;
 
@@ -340,10 +338,8 @@ static void delete_cluts(DVBSubContext *ctx)
 
 static void delete_objects(DVBSubContext *ctx)
 {
-    DVBSubObject *object;
-
     while (ctx->object_list) {
-        object = ctx->object_list;
+        DVBSubObject *object = ctx->object_list;
 
         ctx->object_list = object->next;
 
@@ -353,10 +349,8 @@ static void delete_objects(DVBSubContext *ctx)
 
 static void delete_regions(DVBSubContext *ctx)
 {
-    DVBSubRegion *region;
-
     while (ctx->region_list) {
-        region = ctx->region_list;
+        DVBSubRegion *region = ctx->region_list;
 
         ctx->region_list = region->next;
 



More information about the ffmpeg-cvslog mailing list