diff options
| author | Anthony Delannoy <anthony.2lannoy@gmail.com> | 2019-08-21 11:36:15 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2019-09-19 21:30:54 +0200 |
| commit | 81bb71761ac3bcac6d70c66267636753494174cc (patch) | |
| tree | 2bd4a5722f5685d5343eda2820f217fd20ee0f32 /libavcodec | |
| parent | 5e51c1aeb5b3497ce37f3eddab4c252125d54221 (diff) | |
| download | ffmpeg-81bb71761ac3bcac6d70c66267636753494174cc.tar.gz | |
avcodec: add EPG codec ID
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 6 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0ec3e73865..c91ee4af5b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -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, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index d2c6863d3c..0602ecb1b5 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3198,6 +3198,12 @@ static const AVCodecDescriptor codec_descriptors[] = { .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, .name = "bintext", diff --git a/libavcodec/version.h b/libavcodec/version.h index c7a2bd0bdc..bef8dfba38 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 57 +#define LIBAVCODEC_VERSION_MINOR 58 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |