• Michael Niedermayer's avatar
    Merge commit '688b132b' · 8943925d
    Michael Niedermayer authored
    * commit '688b132b':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8943925d
targa.c 10.6 KB