diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-11-14 12:22:06 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-01-27 09:17:48 +0100 |
| commit | 728685f37ab333ca35980bd01766c78d197f784a (patch) | |
| tree | a7a8cb43ab86dd21d5df02d64b312c96a9ca240b /libavcodec | |
| parent | 80a11de7dca315505bf203ce9c8c016e71724fd2 (diff) | |
| download | ffmpeg-728685f37ab333ca35980bd01766c78d197f784a.tar.gz | |
Add a side data type for audio service type.
Currently, audio service type is a field in AVCodecContext. However,
side data is more appropriate for this kind of information.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 6 | ||||
| -rw-r--r-- | libavcodec/utils.c | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1abe985a48..87f3a83b1d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -917,6 +917,12 @@ enum AVPacketSideDataType { * Stereoscopic 3D information in form of the AVStereo3D struct. */ 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, }; typedef struct AVPacketSideData { diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 27f1039d00..5493055946 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -569,6 +569,7 @@ int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, { AV_PKT_DATA_DISPLAYMATRIX, AV_FRAME_DATA_DISPLAYMATRIX }, { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, + { AV_PKT_DATA_AUDIO_SERVICE_TYPE, AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, }; frame->color_primaries = avctx->color_primaries; diff --git a/libavcodec/version.h b/libavcodec/version.h index 20904f1549..e3168c4a8e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 56 -#define LIBAVCODEC_VERSION_MINOR 11 +#define LIBAVCODEC_VERSION_MINOR 12 #define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |