Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 09:37:38 +0000 (11:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 29 Jun 2013 09:47:26 +0000 (11:47 +0200)
* commit '6652338f43ef623045912d7f28b61adea05d27ae':
  wmapro: return early on unsupported condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/wmaprodec.c

Simple merge