Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:30:23 +0000 (01:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:30:23 +0000 (01:30 +0100)
commit55d8cac254ee2aeba051810ca92bb868fcbd8468
treefefc7eff8028c9c7df0451625f766c1d4dc7fd87
parent501db2f32babff8e2851ffd7aeb6bcb1ecb47d19
parent6689474b91049411b5b7986616d1c66b701ae11f
Merge commit '6689474b91049411b5b7986616d1c66b701ae11f'

* commit '6689474b91049411b5b7986616d1c66b701ae11f':
  v210x: return meaningful error codes.
  r210dec: return meaningful error codes.
  vb: cosmetics, reformat

Conflicts:
libavcodec/vb.c

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