Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 13:45:15 +0000 (15:45 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 19 Jul 2015 14:05:33 +0000 (16:05 +0200)
* commit '6b15874fc2c3f565732201f7907ae1112727d6ae':
  af_resample: do not touch the timestamps if we are not resampling

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
1  2 
libavfilter/af_resample.c

Simple merge