diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-31 13:10:38 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-01 18:18:17 +0000 |
| commit | 66e9d2f44ee0b5d9a4b042a5a895ce88a43f10be (patch) | |
| tree | 0ea3391c558fc20ec65ea1a4e5c9438c6474dffc | |
| parent | e3a125c970dbb99aa3b4f2aa126433709403c988 (diff) | |
| download | ffmpeg-66e9d2f44ee0b5d9a4b042a5a895ce88a43f10be.tar.gz | |
avutil: Add GOP timecode frame side data
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavutil/frame.c | 1 | ||||
| -rw-r--r-- | libavutil/frame.h | 7 | ||||
| -rw-r--r-- | libavutil/version.h | 4 |
4 files changed, 12 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 15aefb5f47..45ccf13358 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2015-08-28 API changes, most recent first: +2016-01-31 - xxxxxxx - lavu 55.17.100 + Add AV_FRAME_DATA_GOP_TIMECODE for exporting MPEG1/2 GOP timecodes. + 2016-01-01 - xxxxxxx - lavc 57.21.100 / 57.12.0 - avcodec.h Add AVCodecDescriptor.profiles and avcodec_profile_name(). diff --git a/libavutil/frame.c b/libavutil/frame.c index 9f9c720268..c33e4627c1 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -733,6 +733,7 @@ const char *av_frame_side_data_name(enum AVFrameSideDataType type) case AV_FRAME_DATA_SKIP_SAMPLES: return "Skip samples"; case AV_FRAME_DATA_AUDIO_SERVICE_TYPE: return "Audio service type"; case AV_FRAME_DATA_MASTERING_DISPLAY_METADATA: return "Mastering display metadata"; + case AV_FRAME_DATA_GOP_TIMECODE: return "GOP timecode"; } return NULL; } diff --git a/libavutil/frame.h b/libavutil/frame.h index 406c8b5b66..8dc4049072 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -116,7 +116,12 @@ enum AVFrameSideDataType { * an AVMasteringDisplayMetadata type and contains information about the * mastering display color volume. */ - AV_FRAME_DATA_MASTERING_DISPLAY_METADATA + AV_FRAME_DATA_MASTERING_DISPLAY_METADATA, + /** + * The GOP timecode in 25 bit timecode format. Data format is 64-bit integer. + * This is set on the first frame of a GOP that has a temporal reference of 0. + */ + AV_FRAME_DATA_GOP_TIMECODE }; enum AVActiveFormatDescription { diff --git a/libavutil/version.h b/libavutil/version.h index 8e1963cf86..5352f26949 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -64,8 +64,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 55 -#define LIBAVUTIL_VERSION_MINOR 16 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 17 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |