OSDN Git Service

Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:34:36 +0000 (23:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 22:34:36 +0000 (23:34 +0100)
commitd06dce21a454f541acec329aa5299e67cd9d0994
tree9c66eabd3425eb25a3bf5ad9c5ad4e6f6e84307b
parent41572ac698b3ad0b9cfda31e546d6d45c3f962dd
parent42c8f92e2fa390fa17b03d37b4323ec0d721d4cd
Merge commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd'

* commit '42c8f92e2fa390fa17b03d37b4323ec0d721d4cd':
  wmv2: Return meaningful error codes

Conflicts:
libavcodec/wmv2dec.c

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