Merge commit 'ade402804a0e811cd00862c90559121a793054a6'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 13:39:02 +0000 (14:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Jan 2013 13:39:02 +0000 (14:39 +0100)
commit3a9f48f0337ddb51c167193548a635f68258b57d
tree86302ea25c663e09b1b16aa9e80795748f8f9aeb
parent446d62f0cfea35ad1695f756b5275288498e51e1
parentade402804a0e811cd00862c90559121a793054a6
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@gmx.at>
libavcodec/cyuv.c
libavcodec/eatgv.c
libavcodec/txd.c