diff options
| author | Limin Wang <lance.lmwang@gmail.com> | 2020-06-30 23:18:17 +0800 |
|---|---|---|
| committer | Limin Wang <lance.lmwang@gmail.com> | 2020-07-15 05:47:14 +0800 |
| commit | 448a9aaa78119e0ac059ed08fa17613df63c780b (patch) | |
| tree | 76d083e3e70c6f5db211ba221d29164490f932ae /libavcodec | |
| parent | c24c6a1bee10fc5526803dbeaf2a18453f50b9a8 (diff) | |
| download | ffmpeg-448a9aaa78119e0ac059ed08fa17613df63c780b.tar.gz | |
API: add AV_PKT_DATA_S12M_TIMECODE to AVPacketSideDataType
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avpacket.c | 1 | ||||
| -rw-r--r-- | libavcodec/decode.c | 1 | ||||
| -rw-r--r-- | libavcodec/packet.h | 8 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/avpacket.c b/libavcodec/avpacket.c index dce26cb31a..4801163227 100644 --- a/libavcodec/avpacket.c +++ b/libavcodec/avpacket.c @@ -400,6 +400,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_PRFT: return "Producer Reference Time"; case AV_PKT_DATA_ICC_PROFILE: return "ICC Profile"; case AV_PKT_DATA_DOVI_CONF: return "DOVI configuration record"; + case AV_PKT_DATA_S12M_TIMECODE: return "SMPTE ST 12-1:2014 timecode"; } return NULL; } diff --git a/libavcodec/decode.c b/libavcodec/decode.c index de9c079f9d..f2244fc9d9 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -1699,6 +1699,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, { AV_PKT_DATA_A53_CC, AV_FRAME_DATA_A53_CC }, { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, + { AV_PKT_DATA_S12M_TIMECODE, AV_FRAME_DATA_S12M_TIMECODE }, }; if (pkt) { diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 96f237f091..0a19a0eff3 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -283,6 +283,14 @@ enum AVPacketSideDataType { AV_PKT_DATA_DOVI_CONF, /** + * Timecode which conforms to SMPTE ST 12-1:2014. The data is an array of 4 uint32_t + * where the first uint32_t describes how many (1-3) of the other timecodes are used. + * The timecode format is described in the documentation of av_timecode_get_smpte_from_framenum() + * function in libavutil/timecode.h. + */ + AV_PKT_DATA_S12M_TIMECODE, + + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may * change when new side data types are added. diff --git a/libavcodec/version.h b/libavcodec/version.h index e75891d463..ad0bfd619d 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 95 +#define LIBAVCODEC_VERSION_MINOR 96 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |