Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:11:14 +0000 (01:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 7 Jan 2013 00:11:14 +0000 (01:11 +0100)
commit4b20d307b32b3562b7cd595cd00dae30203a51fc
tree17ee8efca7410f6f222b61f7b48799ddfaebd721
parentd30660306ceb070a3d74bca3b4a9f99a09b685dc
parent7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8
Merge commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8'

* commit '7b1fbd4729a52dd7c02622dbe7bb81a6a7ed12f8':
  indeo2: check decoding errors.
  indeo2: return meaningful error codes
  rl2: cosmetics, reformat

Conflicts:
libavcodec/rl2.c

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