[FFmpeg-cvslog] Replace PATCHWELCOME by relevant error codes.

Nicolas George git at videolan.org
Tue Dec 20 19:11:41 CET 2011


ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Tue Dec 20 19:08:04 2011 +0100| [b0aaf304a778f0a49d42c032aa83efa62c3291c4] | committer: Nicolas George

Replace PATCHWELCOME by relevant error codes.

This supersedes commit 154c0a8.
The bug was also reported by Rafaël Carré.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0aaf304a778f0a49d42c032aa83efa62c3291c4
---

 libavcodec/libcelt_dec.c |    2 +-
 libavformat/sbgdec.c     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libcelt_dec.c b/libavcodec/libcelt_dec.c
index f982daf..ffc608f 100644
--- a/libavcodec/libcelt_dec.c
+++ b/libavcodec/libcelt_dec.c
@@ -40,7 +40,7 @@ static int ff_celt_error_to_averror(int err)
 #endif
         case CELT_INTERNAL_ERROR:   return AVERROR(EFAULT);
         case CELT_CORRUPTED_DATA:   return AVERROR_INVALIDDATA;
-        case CELT_UNIMPLEMENTED:    return AVERROR_PATCHWELCOME;
+        case CELT_UNIMPLEMENTED:    return AVERROR(ENOSYS);
 #ifdef ENOTRECOVERABLE
         case CELT_INVALID_STATE:    return AVERROR(ENOTRECOVERABLE);
 #endif
diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
index e3a05ff..fb0882c 100644
--- a/libavformat/sbgdec.c
+++ b/libavformat/sbgdec.c
@@ -1467,7 +1467,7 @@ static int sbg_read_seek2(AVFormatContext *avf, int stream_index,
                           int64_t min_ts, int64_t ts, int64_t max_ts, int flags)
 {
     if (flags || stream_index > 0)
-        return AVERROR_PATCHWELCOME;
+        return AVERROR(EINVAL);
     if (stream_index < 0)
         ts = av_rescale_q(ts, AV_TIME_BASE_Q, avf->streams[0]->time_base);
     avf->streams[0]->cur_dts = ts;



More information about the ffmpeg-cvslog mailing list