diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-10-24 23:58:15 +0200 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-10-24 23:58:18 +0200 |
| commit | 4d46fd0b3ed14cfcfc4fd7fc1e4fb29f8fcea65c (patch) | |
| tree | e5d66c0058a822bd7039b75a5a51e0bc2da87548 /libavcodec | |
| parent | 60d9ee1b75b37e9d188cf7321d0d74d8714da696 (diff) | |
| download | ffmpeg-4d46fd0b3ed14cfcfc4fd7fc1e4fb29f8fcea65c.tar.gz | |
lavc: add AV_PKT_DATA_SUBTITLE_POSITION side data type.
This commit introduces a new packet side data type for the subtitle
position information. This is meant to be used by the SRT format where
that information is stored along with the timing, which is not part of
the subrip packets.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 11 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0374de47f2..1495c9e2bd 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -948,6 +948,17 @@ enum AVPacketSideDataType { * the list, so it is required to rely on the side data size to stop. */ AV_PKT_DATA_STRINGS_METADATA, + + /** + * Subtitle event position + * @code + * u32le x1 + * u32le y1 + * u32le x2 + * u32le y2 + * @endcode + */ + AV_PKT_DATA_SUBTITLE_POSITION, }; typedef struct AVPacket { diff --git a/libavcodec/version.h b/libavcodec/version.h index a52d72668b..f878efe811 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 54 -#define LIBAVCODEC_VERSION_MINOR 68 +#define LIBAVCODEC_VERSION_MINOR 69 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |