[FFmpeg-cvslog] Merge commit 'ade402804a0e811cd00862c90559121a793054a6'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jan 26 14:39:02 2013 +0100| [3a9f48f0337ddb51c167193548a635f68258b57d] | committer: Michael Niedermayer

Merge commit 'ade402804a0e811cd00862c90559121a793054a6'

* commit 'ade402804a0e811cd00862c90559121a793054a6':
  eatgv: return meaningful error codes.
  cyuv: return meaningful error codes.
  txd: return meaningful error codes.

Conflicts:
	libavcodec/cyuv.c
	libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a9f48f0337ddb51c167193548a635f68258b57d
---