diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-29 21:06:49 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-29 21:06:49 -0300 |
| commit | d268094f889479a8edee43d8c847da8838b8bf0f (patch) | |
| tree | c18f40311df91539300d2b269a628761dbe0c12d /libavutil | |
| parent | eb01ac6c75b5b42a9d50d405248cb3315ccb3965 (diff) | |
| parent | 99e9697e3a12ab4a6638a36b95edafd6a98f9eaa (diff) | |
| download | ffmpeg-d268094f889479a8edee43d8c847da8838b8bf0f.tar.gz | |
Merge commit '99e9697e3a12ab4a6638a36b95edafd6a98f9eaa'
* commit '99e9697e3a12ab4a6638a36b95edafd6a98f9eaa':
stereo3d: Support view type for frame sequence type
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/stereo3d.h | 24 | ||||
| -rw-r--r-- | libavutil/version.h | 3 |
2 files changed, 25 insertions, 2 deletions
diff --git a/libavutil/stereo3d.h b/libavutil/stereo3d.h index 54f4c4c5c7..d421aac2a2 100644 --- a/libavutil/stereo3d.h +++ b/libavutil/stereo3d.h @@ -141,6 +141,25 @@ enum AVStereo3DType { AV_STEREO3D_COLUMNS, }; +/** + * List of possible view types. + */ +enum AVStereo3DView { + /** + * Frame contains two packed views. + */ + AV_STEREO3D_VIEW_PACKED, + + /** + * Frame contains only the left view. + */ + AV_STEREO3D_VIEW_LEFT, + + /** + * Frame contains only the right view. + */ + AV_STEREO3D_VIEW_RIGHT, +}; /** * Inverted views, Right/Bottom represents the left view. @@ -164,6 +183,11 @@ typedef struct AVStereo3D { * Additional information about the frame packing. */ int flags; + + /** + * Determines which views are packed. + */ + enum AVStereo3DView view; } AVStereo3D; /** diff --git a/libavutil/version.h b/libavutil/version.h index 41dc6ad40b..285d2f1cf9 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -78,9 +78,8 @@ * @{ */ - #define LIBAVUTIL_VERSION_MAJOR 56 -#define LIBAVUTIL_VERSION_MINOR 3 +#define LIBAVUTIL_VERSION_MINOR 4 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |