]> git.sesse.net Git - ffmpeg/commitdiff
avcodec: add EPG codec ID
authorAnthony Delannoy <anthony.2lannoy@gmail.com>
Wed, 21 Aug 2019 09:36:15 +0000 (11:36 +0200)
committerMarton Balint <cus@passwd.hu>
Thu, 19 Sep 2019 19:30:54 +0000 (21:30 +0200)
Signed-off-by: Marton Balint <cus@passwd.hu>
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h

index 0ec3e73865b8a9ddea961fc5029b479b3d8dccce..c91ee4af5b4926a4543c774dabb6ee4b5bccf977 100644 (file)
@@ -690,6 +690,7 @@ enum AVCodecID {
     AV_CODEC_ID_TTF = 0x18000,
 
     AV_CODEC_ID_SCTE_35, ///< Contain timestamp estimated through PCR of program stream.
+    AV_CODEC_ID_EPG,
     AV_CODEC_ID_BINTEXT    = 0x18800,
     AV_CODEC_ID_XBIN,
     AV_CODEC_ID_IDF,
index d2c6863d3c846b888ae9648b57f0eec4efaaea33..0602ecb1b5b924be2342688d869a08c70e025ff7 100644 (file)
@@ -3197,6 +3197,12 @@ static const AVCodecDescriptor codec_descriptors[] = {
         .name      = "scte_35",
         .long_name = NULL_IF_CONFIG_SMALL("SCTE 35 Message Queue"),
     },
+    {
+        .id        = AV_CODEC_ID_EPG,
+        .type      = AVMEDIA_TYPE_DATA,
+        .name      = "epg",
+        .long_name = NULL_IF_CONFIG_SMALL("Electronic Program Guide"),
+    },
     {
         .id        = AV_CODEC_ID_BINTEXT,
         .type      = AVMEDIA_TYPE_VIDEO,
index c7a2bd0bdc3a65d7600fdde74192a32bf8665c81..bef8dfba3885699c48ff1bc05a06fd4e034dd603 100644 (file)
@@ -28,7 +28,7 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  58
-#define LIBAVCODEC_VERSION_MINOR  57
+#define LIBAVCODEC_VERSION_MINOR  58
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \