Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 14:19:48 +0000 (15:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 14:19:48 +0000 (15:19 +0100)
commit8ab97a60ef949f9f2cc0de768143c3ce89a1aabf
tree774977e67d24d31e78d11b94b595507beec318d2
parentc0c06c1bba80c4bee162a3c40eec678ddc65571d
parenta0cabd0a27587525e90a44660c795d40d2f44fe2
Merge commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2'

* commit 'a0cabd0a27587525e90a44660c795d40d2f44fe2':
  mimic: cosmetics, reformat
  iff: drop ff_ prefix from a static function.
  pngdec: cosmetics, reformat.
  dxa: return meaningful error codes.
  eatgq: cosmetics, reformat.

Conflicts:
libavcodec/dxa.c
libavcodec/eatgq.c
libavcodec/iff.c
libavcodec/mimic.c
libavcodec/pngdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dxa.c
libavcodec/eatgq.c
libavcodec/iff.c
libavcodec/mimic.c
libavcodec/pngdec.c