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)
commit562e8d019ba2205a31cf78808e9c4d633bd158be
tree6b9207a3db3398917a36b7e328fef3f5e0a4ba88
parent3e33db3f652e019c18f5b4c5247396dd18f9a15a
parent6652338f43ef623045912d7f28b61adea05d27ae
Merge commit '6652338f43ef623045912d7f28b61adea05d27ae'

* commit '6652338f43ef623045912d7f28b61adea05d27ae':
  wmapro: return early on unsupported condition

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