Merge commit '688b132b881d423877e38dc82f17e23a604be676'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:04:58 +0000 (15:04 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:04:58 +0000 (15:04 +0100)
commit8943925d1f68316218a9722c3f275ae1ae29b325
tree455f017242d1ab01e0eb2e4ae981b79e986e2015
parent329675cfd71fab29e47ea9c64f3560f0305dbf36
parent688b132b881d423877e38dc82f17e23a604be676
Merge commit '688b132b881d423877e38dc82f17e23a604be676'

* commit '688b132b881d423877e38dc82f17e23a604be676':
  qdrw: return meaningful error codes.
  qtrle: return a meaningful error code.
  gifdec: return meaningful error codes.
  interplayvideo: remove a static variable.
  interplayvideo: return meaningful error codes.
  lcldec: return meaningful error codes.
  targa: return meaningful error codes.
  qpeg: return a meaningful error code.
  nuv: return meaningful error codes.

Conflicts:
libavcodec/gifdec.c
libavcodec/interplayvideo.c
libavcodec/nuv.c
libavcodec/qpeg.c
libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/gifdec.c
libavcodec/interplayvideo.c
libavcodec/lcldec.c
libavcodec/nuv.c
libavcodec/qdrw.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/targa.c