[FFmpeg-cvslog] Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  2 10:45:10 2013 +0200| [cb73f84087abe2d5fecaacc199246bacf2f450c8] | committer: Michael Niedermayer

Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'

* commit '390b4d7088b5cecace245fee0c54a57e24dabdf4':
  flvdec: Fix = vs. == typo in sample rate check

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

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