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 | |
| parent | b44456c908965231160f9b8f88de8c0dc447aa1f (diff) | |
| parent | 728685f37ab333ca35980bd01766c78d197f784a (diff) | |
| download | ffmpeg-62a82c66cd3f03e045867471c5edcc84b4d2b54e.tar.gz | |
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')
| -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 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 diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e18ed2d751..df4f6e68ae 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -746,6 +746,7 @@ int ff_init_buffer_info(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 }, }; if (pkt) { diff --git a/libavcodec/version.h b/libavcodec/version.h index eafa12d43c..dfb95e098f 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 20 +#define LIBAVCODEC_VERSION_MINOR 21 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |