[FFmpeg-cvslog] Merge commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a' into release/1.1

Michael Niedermayer git at videolan.org
Mon Apr 21 17:02:26 CEST 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 16:56:14 2014 +0200| [6e3830cca297996736784016a8bc908f8cb98cf3] | committer: Michael Niedermayer

Merge commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a' into release/1.1

* commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a':
  resample: fix avresample_get_delay() return value

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list