diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:02:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 18:03:43 +0100 |
| commit | 62a82c66cd3f03e045867471c5edcc84b4d2b54e (patch) | |
| tree | ed8a8d99a235f959088b28fe131c6c4e5fcbe610 /libavutil | |
| parent | b44456c908965231160f9b8f88de8c0dc447aa1f (diff) | |
| parent | 728685f37ab333ca35980bd01766c78d197f784a (diff) | |
Merge commit '728685f37ab333ca35980bd01766c78d197f784a'
* commit '728685f37ab333ca35980bd01766c78d197f784a':
Add a side data type for audio service type.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/frame.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.h | 6 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index d335bee831..1e296521ff 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -106,6 +106,12 @@ enum AVFrameSideDataType { * @endcode */ AV_FRAME_DATA_SKIP_SAMPLES, + + /** + * This side data must be associated with an audio frame and corresponds to + * enum AVAudioServiceType defined in avcodec.h. + */ + AV_FRAME_DATA_AUDIO_SERVICE_TYPE, }; enum AVActiveFormatDescription { diff --git a/libavutil/version.h b/libavutil/version.h index 8be61e356f..053bd990d1 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -56,7 +56,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 54 -#define LIBAVUTIL_VERSION_MINOR 17 +#define LIBAVUTIL_VERSION_MINOR 18 #define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |