Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 May 2013 08:33:50 +0000 (10:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 May 2013 08:33:50 +0000 (10:33 +0200)
commit23a7c32a7ade12044c600aa48966829c53dcc836
tree8e5fd9fad7eceefd96095525b47af077cef4cf38
parent0104570fb65bef9986a630e0188b3756295693a9
parent69467fb64ba4972c7aa436ded2468bb32df9fa97
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wav: return meaningful errors

Conflicts:
libavformat/wavdec.c

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