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/version.h | |
parent | 9ccd90626f0ecef205faef1d25f0e3649d18e1b3 (diff) | |
parent | 34ed5c2e4d9b7fe5c9b3aae2da5599fabb95c02e (diff) | |
download | ffmpeg-streaming-1899b2579993c4faca79cade01e374378db128dd.zip ffmpeg-streaming-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/version.h')
-rw-r--r-- | libavformat/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index f7a2e09..7e70663 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 |