diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:30:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-03 11:30:00 +0200 |
| commit | 88ef7f6d2ba773d01ed246d18e08fd9fcb3c98b5 (patch) | |
| tree | 82ddc6ef0f16d5f6e7eecc251e9f422f4299a980 /libavcodec/version.h | |
| parent | 6190aae90dbe05d9cebfbe1a33ff6acafffeaefd (diff) | |
| parent | 803d21f38bdafe7c4e2571a9ae7052013a12923b (diff) | |
Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'
* commit '803d21f38bdafe7c4e2571a9ae7052013a12923b':
lavc: schedule AVCodecContext.lowres for removal on next bump.
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/version.h')
| -rw-r--r-- | libavcodec/version.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/version.h b/libavcodec/version.h index d6f7b8eb2b..c305747ffd 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -88,5 +88,8 @@ #ifndef FF_API_MISSING_SAMPLE #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_LOWRES +#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ |