diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 14:43:20 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-14 14:43:20 +0200 |
| commit | 1899b2579993c4faca79cade01e374378db128dd (patch) | |
| tree | c867a55af62bb55bceb084c7cd5eeff5ac93490a /libavformat | |
| parent | 9ccd90626f0ecef205faef1d25f0e3649d18e1b3 (diff) | |
| parent | 34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e (diff) | |
| download | ffmpeg-1899b2579993c4faca79cade01e374378db128dd.tar.gz | |
Merge commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e'
* commit '34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e':
avformat: Do not use AVFMT_RAWPICTURE
Removal from ffmpeg.c not merged because some parts of avdevice
still use it
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
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 e2a27d437b..f3ffcfbe38 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -465,8 +465,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. */ @@ -511,7 +513,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 f7a2e09852..7e706637a9 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -65,6 +65,9 @@ #ifndef FF_API_URL_FEOF #define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58) #endif +#ifndef FF_API_LAVF_FMT_RAWPICTURE +#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58) +#endif #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 |