[FFmpeg-cvslog] pict_type: add a value for unknown/none.
Martin Matuska
git at videolan.org
Wed Jul 27 12:49:38 CEST 2011
ffmpeg | branch: release/0.7 | Martin Matuska <mm at FreeBSD.org> | Tue Jun 28 13:26:56 2011 +0200| [d052370c1eb5c50ad2dd2cac1b967699f42c62b0] | committer: Michael Niedermayer
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)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d052370c1eb5c50ad2dd2cac1b967699f42c62b0
---
libavutil/avutil.h | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 4d6ef66..8affad6 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
More information about the ffmpeg-cvslog
mailing list