[FFmpeg-cvslog] Merge remote-tracking branch 'cehoyos/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 30 13:41:39 2013 +0100| [89ec4f4d5eb9d2c60ccec2f4c14e19949ae77326] | committer: Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix compilation with --enable-decoder=webp --disable-decoder=vp8
  Do not show "Estimating duration from bitrate" warning if no duration was estimated.

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

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