diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2011-06-28 13:26:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-28 13:41:49 +0200 |
| commit | ce993ce791cd01916d79e315d1558b016d2770df (patch) | |
| tree | c18bca62085cdb80a67806c759d91008b7010e99 | |
| parent | c0b90d40888147b314ca788bba406882c3d25d1a (diff) | |
| download | ffmpeg-ce993ce791cd01916d79e315d1558b016d2770df.tar.gz | |
pict_type: add a value for unknown/none.
In commit bebe72f4a05d338e04ae9ca1e9c6b72749b488aa, the enum AV_PICTURE_TYPE_* was introduced. There are still places in the code where pict_type is used as an integer and there is a case where "pict_type = 0" with the explanation "let ffmpeg decide what to do". The new enum does not know a value of 0 and C++ will fail if compiling such programs anyway as it is refered as an int (and you cannot patch them properly).
(cherry picked from commit 512933671409f9f88cc9fdfc8f29525d32240bab)
| -rw-r--r-- | libavutil/avutil.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 05b45ce8bf..59b59db29e 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -112,7 +112,8 @@ enum AVMediaType { #define FF_API_OLD_IMAGE_NAMES (LIBAVUTIL_VERSION_MAJOR < 51) #endif enum AVPictureType { - AV_PICTURE_TYPE_I = 1, ///< Intra + AV_PICTURE_TYPE_NONE = 0, ///< Undefined + AV_PICTURE_TYPE_I, ///< Intra AV_PICTURE_TYPE_P, ///< Predicted AV_PICTURE_TYPE_B, ///< Bi-dir predicted AV_PICTURE_TYPE_S, ///< S(GMC)-VOP MPEG4 |