diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:03:55 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 14:03:55 +0100 |
| commit | 83e89787984d3f96cb793ebfddc6078d6bc50073 (patch) | |
| tree | be7e09b4e106d85247a3650aa7ff578071482577 /libavcodec | |
| parent | 595ba3b96258538566d6f42113dd0180aaee87c4 (diff) | |
| parent | 5a7e35dd2351c30bab45177b9482cb8833a0ca78 (diff) | |
| download | ffmpeg-83e89787984d3f96cb793ebfddc6078d6bc50073.tar.gz | |
Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'
* commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78':
Add replaygain side data type and code for parsing replaygain tags.
Conflicts:
libavcodec/avcodec.h
libavcodec/version.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/version.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 818172257d..92b5f2c346 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1003,6 +1003,12 @@ enum AVPacketSideDataType { AV_PKT_DATA_H263_MB_INFO, /** + * This side data should be associated with an audio stream and contains + * ReplayGain information in form of the AVReplayGain struct. + */ + AV_PKT_DATA_REPLAYGAIN, + + /** * Recommmends skipping the specified number of samples * @code * u32le number of samples to skip from start of this packet diff --git a/libavcodec/version.h b/libavcodec/version.h index 528c30b9bb..96e7b4eb9f 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 53 +#define LIBAVCODEC_VERSION_MINOR 54 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ |