From 35498c124a81d4207e34e115840138d71307c2e3 Mon Sep 17 00:00:00 2001
From: Devin Heitmueller <dheitmueller@ltnglobal.com>
Date: Fri, 7 Sep 2018 15:40:26 -0400
Subject: [PATCH] avcodec: add AV_PKT_DATA_AFD to allow AFD data to be embedded
 in AVPacket

Create a new AVPacket side data type for Active Format Description,
which mirrors the side data type found in AVFrame.  The primary
use case for this is ensuring AFD gets preserved in the V210
encoder, so that the decklink libavdevice can output AFD.

Signed-off-by: Devin Heitmueller <dheitmueller@ltnglobal.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
---
 doc/APIchanges       | 3 +++
 libavcodec/avcodec.h | 6 ++++++
 libavcodec/version.h | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/doc/APIchanges b/doc/APIchanges
index 468cc122c75..a40476d6303 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil:     2017-10-21
 
 API changes, most recent first:
 
+2018-09-09 - xxxxxxxxxx - lavc 58.29.100 - avcodec.h
+  Add AV_PKT_DATA_AFD
+
 2018-08-16 - xxxxxxxxxx - lavc 58.23.100 - avcodec.h
   Add av_bsf_flush().
 
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 719c181a08c..705a3ce4f3e 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1365,6 +1365,12 @@ enum AVPacketSideDataType {
      */
     AV_PKT_DATA_ENCRYPTION_INFO,
 
+    /**
+     * Active Format Description data consisting of a single byte as specified
+     * in ETSI TS 101 154 using AVActiveFormatDescription enum.
+     */
+    AV_PKT_DATA_AFD,
+
     /**
      * The number of side data types.
      * This is not part of the public API/ABI in the sense that it may
diff --git a/libavcodec/version.h b/libavcodec/version.h
index c09249191c3..9aaa24b0922 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -28,7 +28,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  58
-#define LIBAVCODEC_VERSION_MINOR  28
+#define LIBAVCODEC_VERSION_MINOR  29
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-- 
GitLab