[FFmpeg-cvslog] Merge commit '9277050e2918e0a0df9689721a188a604d886616'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 29 22:27:01 2013 +0200| [554c22c710915845834333cc3c15d449f88e353a] | committer: Michael Niedermayer

Merge commit '9277050e2918e0a0df9689721a188a604d886616'

* commit '9277050e2918e0a0df9689721a188a604d886616':
  vqf: Make sure sample_rate is set to a valid value

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

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