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 /libavutil/frame.h | |
| parent | 595ba3b96258538566d6f42113dd0180aaee87c4 (diff) | |
| parent | 5a7e35dd2351c30bab45177b9482cb8833a0ca78 (diff) | |
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 'libavutil/frame.h')
| -rw-r--r-- | libavutil/frame.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 9fedba8635..6587439ab1 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -92,6 +92,10 @@ enum AVFrameSideDataType { * The data is the AVDownmixInfo struct defined in libavutil/downmix_info.h. */ AV_FRAME_DATA_DOWNMIX_INFO, + /** + * ReplayGain information in the form of the AVReplayGain struct. + */ + AV_FRAME_DATA_REPLAYGAIN, }; typedef struct AVFrameSideData { |