har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '803d21f38bdafe7c4e2571a9ae7052013a12923b'

Browse Source 
* commit '803d21f38bdafe7c4e2571a9ae7052013a12923b':
  lavc: schedule AVCodecContext.lowres for removal on next bump.

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-03 11:30:00 +02:00
commit 88ef7f6d2b
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@ -2557,12 +2557,14 @@ typedef struct AVCodecContext {
*/ */
int bits_per_raw_sample; int bits_per_raw_sample;
#if FF_API_LOWRES
/** /**
* low resolution decoding, 1-> 1/2 size, 2->1/4 size * low resolution decoding, 1-> 1/2 size, 2->1/4 size
* - encoding: unused * - encoding: unused
* - decoding: Set by user. * - decoding: Set by user.
*/ */
int lowres; int lowres;
#endif
/** /**
* the picture in the bitstream * the picture in the bitstream

3
libavcodec/version.h
View File

@ -88,5 +88,8 @@
#ifndef FF_API_MISSING_SAMPLE #ifndef FF_API_MISSING_SAMPLE
#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 56) #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 56)
#endif #endif
#ifndef FF_API_LOWRES
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */