diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:20:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 18:20:37 +0200 |
| commit | 78eaaa857e95fa5542dc008c8ad3664e6ab6801a (patch) | |
| tree | 41bed9cbaefc6147bd6acbb8018e9e1dd33544ca /libavutil/error.h | |
| parent | 0d0d24af0159ff08f396ad04cd63ce5655b1fc60 (diff) | |
| parent | fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45 (diff) | |
| download | ffmpeg-streaming-78eaaa857e95fa5542dc008c8ad3664e6ab6801a.zip ffmpeg-streaming-78eaaa857e95fa5542dc008c8ad3664e6ab6801a.tar.gz | |
Merge commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45'
* commit 'fb1ddcdc8f51b9d261ae8e9c26b91e81f7b6bf45':
avresample: Introduce AVFrame-based API
Conflicts:
libavresample/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/error.h')
| -rw-r--r-- | libavutil/error.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/error.h b/libavutil/error.h index f3fd7bb..621279a 100644 --- a/libavutil/error.h +++ b/libavutil/error.h @@ -70,6 +70,8 @@ #define AVERROR_BUG2 FFERRTAG( 'B','U','G',' ') #define AVERROR_UNKNOWN FFERRTAG( 'U','N','K','N') ///< Unknown error, typically from an external library #define AVERROR_EXPERIMENTAL (-0x2bb2afa8) ///< Requested feature is flagged experimental. Set strict_std_compliance if you really want to use it. +#define AVERROR_INPUT_CHANGED (-0x636e6701) ///< Input changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_OUTPUT_CHANGED) +#define AVERROR_OUTPUT_CHANGED (-0x636e6702) ///< Output changed between calls. Reconfiguration is required. (can be OR-ed with AVERROR_INPUT_CHANGED) #define AV_ERROR_MAX_STRING_SIZE 64 |
