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 /libavcodec/avcodec.h | |
| 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 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5c21430ba1..87b53a2840 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1032,6 +1032,12 @@ enum AVPacketSideDataType { AV_PKT_DATA_STEREO3D, /** + * This side data should be associated with an audio stream and corresponds + * to enum AVAudioServiceType. + */ + AV_PKT_DATA_AUDIO_SERVICE_TYPE, + + /** * Recommmends skipping the specified number of samples * @code * u32le number of samples to skip from start of this packet |