Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

* commit '28240a60c1b5ce276e947ba013271ec009adc078':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-01 19:19:58 +01:00
3 changed files with 9 additions and 0 deletions

View File

@@ -1326,7 +1326,9 @@ typedef struct AVCodecContext {
*/
int coded_width, coded_height;
#if FF_API_ASPECT_EXTENDED
#define FF_ASPECT_EXTENDED 15
#endif
/**
* the number of pictures in a group of pictures, or 0 for intra_only