diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-13 19:19:40 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-03-13 19:19:40 +0000 |
| commit | 0edfa79b23163be51d3ee1678f5ff87b5207f636 (patch) | |
| tree | d3efaa930cf0f87be1e67ce2f8caac141089ad48 /libavutil | |
| parent | 382b5b3a0ca57c28191f8d44cb3411bb4ac4ce5e (diff) | |
| download | ffmpeg-0edfa79b23163be51d3ee1678f5ff87b5207f636.tar.gz | |
Make iff.c:decode_init return the value returned by
avctx->get_buffer() in case of error, rather than AVERROR_UNKNOWN
which is deprecated, and mark AVERROR_UNKNOWN for deletion at the next
major bump.
Originally committed as revision 22512 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/error.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/error.h b/libavutil/error.h index a386c1f651..51c613c56d 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -33,7 +33,11 @@ #define AVERROR(e) (e) #define AVUNERROR(e) (e) #endif + +#if LIBAVUTIL_VERSION_MAJOR < 51 #define AVERROR_UNKNOWN AVERROR(EINVAL) /**< unknown error */ +#endif + #define AVERROR_IO AVERROR(EIO) /**< I/O error */ #define AVERROR_NUMEXPECTED AVERROR(EDOM) /**< Number syntax expected in filename. */ #define AVERROR_INVALIDDATA AVERROR(EINVAL) /**< invalid data found */ |