Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:26:28 +0000 (23:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:26:56 +0000 (23:26 +0100)
commit41572ac698b3ad0b9cfda31e546d6d45c3f962dd
tree57c54126fbb03c10de0de976d20dd28032d46fb8
parentd128794fbc5eb5df9645d7e5fefc66abb3c701b5
parentf3e045263e445c4ab54d85ecae359494cd96a3e2
Merge commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2'

* commit 'f3e045263e445c4ab54d85ecae359494cd96a3e2':
  qdm2: Return meaningful error codes

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