diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2015-10-12 16:06:07 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-10-13 13:43:29 +0200 |
| commit | 34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e (patch) | |
| tree | 945785254daf45072207b06386cdb7c008382ce9 /libavformat | |
| parent | 16b0c929621f84983b83b9735ce973acb12723bc (diff) | |
| download | ffmpeg-34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e.tar.gz | |
avformat: Do not use AVFMT_RAWPICTURE
There are no formats supporting it anymore and it is deprecated.
Update the documentation accordingly.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavformat/version.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index aa11cff2f3..143a98639c 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -413,8 +413,10 @@ typedef struct AVProbeData { #define AVFMT_NOFILE 0x0001 #define AVFMT_NEEDNUMBER 0x0002 /**< Needs '%d' in filename. */ #define AVFMT_SHOW_IDS 0x0008 /**< Show format stream IDs numbers. */ +#if FF_API_LAVF_FMT_RAWPICTURE #define AVFMT_RAWPICTURE 0x0020 /**< Format wants AVPicture structure for - raw picture data. */ + raw picture data. @deprecated Not used anymore */ +#endif #define AVFMT_GLOBALHEADER 0x0040 /**< Format wants global header. */ #define AVFMT_NOTIMESTAMPS 0x0080 /**< Format does not need / have any timestamps. */ #define AVFMT_GENERIC_INDEX 0x0100 /**< Use generic index building code. */ @@ -454,7 +456,7 @@ typedef struct AVOutputFormat { enum AVCodecID video_codec; /**< default video codec */ enum AVCodecID subtitle_codec; /**< default subtitle codec */ /** - * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_RAWPICTURE, + * can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, * AVFMT_GLOBALHEADER, AVFMT_NOTIMESTAMPS, AVFMT_VARIABLE_FPS, * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS, AVFMT_ALLOW_FLUSH, * AVFMT_TS_NONSTRICT diff --git a/libavformat/version.h b/libavformat/version.h index f8dbd6ee50..d74968aa53 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -57,5 +57,8 @@ #ifndef FF_API_LAVF_CODEC_TB #define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 58) #endif +#ifndef FF_API_LAVF_FMT_RAWPICTURE +#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58) +#endif #endif /* AVFORMAT_VERSION_H */ |