Merge commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:36:36 +0000 (00:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 31 May 2015 22:37:06 +0000 (00:37 +0200)
* commit 'cffb9ea81bd16d2ed8bce187b6bf0279c07b3b9b':
  mov: reject zero bytes_per_frame with non-zero samples_per_frame

See: 83a04f8cc16f656ee14b71fd7979a48c49c4b830
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge