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>

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;