[FFmpeg-devel] [PATCH 1/3] lavu/error: add AVERROR_REDO.

[Nicolas George]

It is meant for demuxers to signal that they consumed data
but did not return a packet; the framework is then supposed
to loop.

Signed-off-by: Nicolas George <george at nsup.org>
---
 libavutil/error.c   | 1 +
 libavutil/error.h   | 2 +-
 libavutil/version.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)


There was a stray empty line just at the same place.


diff --git a/libavutil/error.c b/libavutil/error.c
index 4425968..a253982 100644
--- a/libavutil/error.c
+++ b/libavutil/error.c
@@ -50,6 +50,7 @@ static const struct error_entry error_entries[] = {
     { ERROR_TAG(OUTPUT_CHANGED),     "Output changed"                                 },
     { ERROR_TAG(PATCHWELCOME),       "Not yet implemented in FFmpeg, patches welcome" },
     { ERROR_TAG(PROTOCOL_NOT_FOUND), "Protocol not found"                             },
+    { ERROR_TAG(REDO),               "Operation must be repeated"                     },
     { ERROR_TAG(STREAM_NOT_FOUND),   "Stream not found"                               },
     { ERROR_TAG(UNKNOWN),            "Unknown error occurred"                         },
     { ERROR_TAG(EXPERIMENTAL),       "Experimental feature"                           },
diff --git a/libavutil/error.h b/libavutil/error.h
index 71df4da..09b47c2 100644
--- a/libavutil/error.h
+++ b/libavutil/error.h
@@ -61,7 +61,7 @@
 #define AVERROR_OPTION_NOT_FOUND   FFERRTAG(0xF8,'O','P','T') ///< Option not found
 #define AVERROR_PATCHWELCOME       FFERRTAG( 'P','A','W','E') ///< Not yet implemented in FFmpeg, patches welcome
 #define AVERROR_PROTOCOL_NOT_FOUND FFERRTAG(0xF8,'P','R','O') ///< Protocol not found
-
+#define AVERROR_REDO               FFERRTAG( 'R','E','D','O') ///< Operation must be repeated
 #define AVERROR_STREAM_NOT_FOUND   FFERRTAG(0xF8,'S','T','R') ///< Stream not found
 /**
  * This is semantically identical to AVERROR_BUG
diff --git a/libavutil/version.h b/libavutil/version.h
index e0ddfd2..6b0d60b 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -56,7 +56,7 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  55
-#define LIBAVUTIL_VERSION_MINOR   9
+#define LIBAVUTIL_VERSION_MINOR  10
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-- 
2.6.2