Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 08:45:10 +0000 (10:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 2 Aug 2013 09:00:50 +0000 (11:00 +0200)
commitcb73f84087abe2d5fecaacc199246bacf2f450c8
tree4f59e8b39b4112bd252cbbe81ac1144e334724ae
parentca1b02910889b44720d3937530c0f544c3a4aa2b
parent390b4d7088b5cecace245fee0c54a57e24dabdf4
Merge commit '390b4d7088b5cecace245fee0c54a57e24dabdf4'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvdec.c