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 | |
| parent | 6190aae90dbe05d9cebfbe1a33ff6acafffeaefd (diff) | |
| parent | 803d21f38bdafe7c4e2571a9ae7052013a12923b (diff) | |
| download | ffmpeg-88ef7f6d2ba773d01ed246d18e08fd9fcb3c98b5.tar.gz | |
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>
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d18b4347db..353a42a67b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2557,12 +2557,14 @@ typedef struct AVCodecContext { */ int bits_per_raw_sample; +#if FF_API_LOWRES /** * low resolution decoding, 1-> 1/2 size, 2->1/4 size * - encoding: unused * - decoding: Set by user. */ int lowres; +#endif /** * the picture in the bitstream 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 */ |