diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:04:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-24 15:04:47 +0100 |
| commit | 8de75f703adafced474ddf748c46d091ee0a8f4a (patch) | |
| tree | 994e24bf92fa5c758a9b02e531aab8f947505d8f /libavfilter/af_volume.h | |
| parent | 3e1f24131ac018c8b4bcc852a02ccfadf20d1dbb (diff) | |
| parent | 06c3cd3c0186803619bc6aad2d8f06c3e9015d15 (diff) | |
| download | ffmpeg-8de75f703adafced474ddf748c46d091ee0a8f4a.tar.gz | |
Merge commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15'
* commit '06c3cd3c0186803619bc6aad2d8f06c3e9015d15':
af_volume: support using replaygain frame side data
Conflicts:
doc/filters.texi
libavfilter/af_volume.c
libavfilter/af_volume.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_volume.h')
| -rw-r--r-- | libavfilter/af_volume.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavfilter/af_volume.h b/libavfilter/af_volume.h index 10ef6fbda3..9f81790ec3 100644 --- a/libavfilter/af_volume.h +++ b/libavfilter/af_volume.h @@ -58,6 +58,13 @@ enum VolumeVarName { VAR_VARS_NB }; +enum ReplayGainType { + REPLAYGAIN_DROP, + REPLAYGAIN_IGNORE, + REPLAYGAIN_TRACK, + REPLAYGAIN_ALBUM, +}; + typedef struct VolumeContext { const AVClass *class; AVFloatDSPContext fdsp; @@ -67,6 +74,7 @@ typedef struct VolumeContext { AVExpr *volume_pexpr; double var_values[VAR_VARS_NB]; + enum ReplayGainType replaygain; double volume; int volume_i; int channels; |