Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 19:45:58 +0000 (21:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 2 Sep 2014 19:45:58 +0000 (21:45 +0200)
commit50c6bffb67d140bcf4b28d0b4495648b9f6b07f9
treecd4b9a89006063727d99cb8061e6b5cf64329603
parent098af260675b601c0a02a373b53ed21b77775f22
parent74512f7e369da40e1148c92b58cd8e59f7737b8f
Merge commit '74512f7e369da40e1148c92b58cd8e59f7737b8f'

* commit '74512f7e369da40e1148c92b58cd8e59f7737b8f':
  8svx: Return proper error codes

Conflicts:
libavcodec/8svx.c

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