Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 14:10:23 +0000 (16:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Apr 2013 14:10:23 +0000 (16:10 +0200)
commit4916e220a60a08c8bf6c7da0786e4a29b14d93d6
tree5bc63cd07fe9158ab6c6751d89851e2e46b1acf5
parent8cff853b23362b0cb88e6d424e3362a437c1a6b7
parentbac8d38c0a716c8bdfdecf0ae545015c68f5df36
Merge commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36'

* commit 'bac8d38c0a716c8bdfdecf0ae545015c68f5df36':
  rv10: return meaningful error codes.

Conflicts:
libavcodec/rv10.c

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