ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun 
Jul 19 15:45:15 2015 +0200| [7093e215d02ed0dc9632f82ac8ccec432d29cd35] | 
committer: Michael Niedermayer

Merge commit '6b15874fc2c3f565732201f7907ae1112727d6ae'

* commit '6b15874fc2c3f565732201f7907ae1112727d6ae':
  af_resample: do not touch the timestamps if we are not resampling

Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7093e215d02ed0dc9632f82ac8ccec432d29cd35
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to