Simplify a lot of subtitle handling code.

Makes it easier to read.  Gets rid of some unnecessary variables.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3886 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 4 insertions, 6 deletions

diff --git a/libhb/decssasub.c b/libhb/decssasub.c
index b0ed845d5..ebdc6d25c 100644
--- a/libhb/decssasub.c
+++ b/libhb/decssasub.c
@@ -454,6 +454,9 @@ static hb_buffer_t *ssa_decode_line_to_picture( hb_work_object_t * w, uint8_t *i
         out->y = frame->dst_y;
         out->width = frame->w;
         out->height = frame->h;
+        out->start = in_start;
+        out->stop = in_stop;
+        out->sequence = in_sequence;
         
         int i;
         int numPixels = frame->w * frame->h;
@@ -477,17 +480,12 @@ static hb_buffer_t *ssa_decode_line_to_picture( hb_work_object_t * w, uint8_t *i
         free(rgba);
         
         *outSubpictureListTailPtr = out;
-        outSubpictureListTailPtr = &out->next_subpicture;
+        outSubpictureListTailPtr = &out->next;
     }
     
     // NOTE: The subpicture list is actually considered a single packet by most other code
     hb_buffer_t *out = outSubpictureList;
     
-    // Copy metadata from the input packet to the output packet
-    out->start = in_start;
-    out->stop = in_stop;
-    out->sequence = in_sequence;
-
     return out;
     
 fail: