From 07f6a66bf553ce02ad9e6dc7d415d3f8faa431fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <ubitux@gmail.com>
Date: Sat, 1 Jun 2013 15:08:00 +0200
Subject: [PATCH] lavf/webvttdec: factorize identifier and settings side data
 code.

---
 libavformat/webvttdec.c | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 894a762dd5..7d9910bec5 100644
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -142,27 +142,19 @@ static int webvtt_read_header(AVFormatContext *s)
         sub->pts = ts_start;
         sub->duration = ts_end - ts_start;
 
-        if (identifier_len) {
-            uint8_t *buf = av_packet_new_side_data(sub,
-                                                   AV_PKT_DATA_WEBVTT_IDENTIFIER,
-                                                   identifier_len);
-            if (!buf) {
-                res = AVERROR(ENOMEM);
-                goto end;
-            }
-            memcpy(buf, identifier, identifier_len);
-        }
+#define SET_SIDE_DATA(name, type) do {                                  \
+    if (name##_len) {                                                   \
+        uint8_t *buf = av_packet_new_side_data(sub, type, name##_len);  \
+        if (!buf) {                                                     \
+            res = AVERROR(ENOMEM);                                      \
+            goto end;                                                   \
+        }                                                               \
+        memcpy(buf, name, name##_len);                                  \
+    }                                                                   \
+} while (0)
 
-        if (settings_len) {
-            uint8_t *buf = av_packet_new_side_data(sub,
-                                                   AV_PKT_DATA_WEBVTT_SETTINGS,
-                                                   settings_len);
-            if (!buf) {
-                res = AVERROR(ENOMEM);
-                goto end;
-            }
-            memcpy(buf, settings, settings_len);
-        }
+        SET_SIDE_DATA(identifier, AV_PKT_DATA_WEBVTT_IDENTIFIER);
+        SET_SIDE_DATA(settings,   AV_PKT_DATA_WEBVTT_SETTINGS);
     }
 
     ff_subtitles_queue_finalize(&webvtt->q);