diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:04:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:04:58 +0100 |
| commit | 8943925d1f68316218a9722c3f275ae1ae29b325 (patch) | |
| tree | 455f017242d1ab01e0eb2e4ae981b79e986e2015 /libavcodec/vcr1.c | |
| parent | 329675cfd71fab29e47ea9c64f3560f0305dbf36 (diff) | |
| parent | 688b132b881d423877e38dc82f17e23a604be676 (diff) | |
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>
Diffstat (limited to 'libavcodec/vcr1.c')
0 files changed, 0 insertions, 0 deletions