Merge commit '9dbbda235d93d628777b986e502213f1ed390973'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:24:32 +0000 (01:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:24:32 +0000 (01:24 +0100)
commit501db2f32babff8e2851ffd7aeb6bcb1ecb47d19
treea911a0ca4813975ecc9baae4182b3fea8ef45944
parent4b20d307b32b3562b7cd595cd00dae30203a51fc
parent9dbbda235d93d628777b986e502213f1ed390973
Merge commit '9dbbda235d93d628777b986e502213f1ed390973'

* commit '9dbbda235d93d628777b986e502213f1ed390973':
  vb: return meaningful error codes.
  ptx: return meaningful error codes.
  tiff: return meaningful error codes.
  vqavideo: return meaningful error codes.
  mss2: return meaningful error codes.
  v210dec: return meaningful error codes
  indeo2: cosmetics, reformat

Conflicts:
libavcodec/indeo2.c
libavcodec/tiff.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo2.c
libavcodec/mss2.c
libavcodec/ptx.c
libavcodec/tiff.c
libavcodec/v210dec.c
libavcodec/vb.c
libavcodec/vqavideo.c