diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:57:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-17 23:59:00 +0200 |
| commit | 2d2b5a1421ee652f76a756024d0210f0b6455fda (patch) | |
| tree | d3fb60a796db87c4217167fd160cd14eae6ee98e /libavutil | |
| parent | c40798441f47341c310b38e8f329cfb943924faf (diff) | |
| download | ffmpeg-2d2b5a1421ee652f76a756024d0210f0b6455fda.tar.gz | |
10l, commit that should have been stashed into the merge.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/error.c | 2 | ||||
| -rw-r--r-- | libavutil/error.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/error.c b/libavutil/error.c index 117c1ce2d5..93f8925d44 100644 --- a/libavutil/error.c +++ b/libavutil/error.c @@ -28,7 +28,7 @@ int av_strerror(int errnum, char *errbuf, size_t errbuf_size) case AVERROR_EOF: errstr = "End of file"; break; case AVERROR_INVALIDDATA: errstr = "Invalid data found when processing input"; break; case AVERROR_NUMEXPECTED: errstr = "Number syntax expected in filename"; break; - case AVERROR_PATCHWELCOME: errstr = "Not yet implemented in Libav, patches welcome"; break; + case AVERROR_PATCHWELCOME: errstr = "Not yet implemented in FFmpeg, patches welcome"; break; case AVERROR_DEMUXER_NOT_FOUND: errstr = "Demuxer not found"; break; case AVERROR_MUXER_NOT_FOUND: errstr = "Muxer not found"; break; case AVERROR_DECODER_NOT_FOUND: errstr = "Decoder not found"; break; diff --git a/libavutil/error.h b/libavutil/error.h index bb74ab3d43..0d475664c7 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -50,7 +50,7 @@ #define AVERROR_EOF AVERROR(EPIPE) ///< End of file -#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) ///< Not yet implemented in Libav, patches welcome +#define AVERROR_PATCHWELCOME (-MKTAG('P','A','W','E')) ///< Not yet implemented in FFmpeg, patches welcome #if LIBAVUTIL_VERSION_MAJOR > 50 #define AVERROR_INVALIDDATA (-MKTAG('I','N','D','A')) ///< Invalid data found when processing input |