aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/iff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-04-13 14:39:51 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-04-13 14:39:51 +0200
commit878f8b0d26e9bd34f27949e8b7d2be6c864ca998 (patch)
tree80dcab1fb6118211073a065d97ed5f9575fc4c50 /libavformat/iff.c
parentc11aa9d29aaea7a9f6952d17707eb549fd32c65e (diff)
parentaaab192df24a90f4450285cfb73b395cf495b462 (diff)
downloadffmpeg-878f8b0d26e9bd34f27949e8b7d2be6c864ca998.tar.gz
Merge commit 'aaab192df24a90f4450285cfb73b395cf495b462'
* commit 'aaab192df24a90f4450285cfb73b395cf495b462': af_volume: implement replaygain clipping prevention Conflicts: doc/filters.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/iff.c')
0 files changed, 0 insertions, 0 deletions