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:36:22 +0200 |
| commit | 512933671409f9f88cc9fdfc8f29525d32240bab (patch) | |
| tree | 5bbc72aab3efc46c20ad2ae7b22b35e7a9223b34 /libavutil/avutil.h | |
| parent | ca699ac24e85c2f4ef8effa5d57d1c3082160d30 (diff) | |
| download | ffmpeg-512933671409f9f88cc9fdfc8f29525d32240bab.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).
Diffstat (limited to 'libavutil/avutil.h')
| -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 33eacc7fae..1b196a916d 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -104,7 +104,8 @@ enum AVMediaType { #define AV_TIME_BASE_Q (AVRational){1, AV_TIME_BASE} 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 |