virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'

Browse Source 
* commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26':
  lavc: Clarify the behaviour of dimension and format context fields

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-15 22:11:43 +02:00
parent 4ed3a01d71 9af7e8045e
commit 20526f2e2f
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/avcodec.h
View File

@@ -1405,21 +1405,31 @@ typedef struct AVCodecContext {
/* video only */ /* video only */
/** /**
* picture width / height. * picture width / height.
*
* @note Those fields may not match the values of the last
* AVFrame outputted by avcodec_decode_video2 due frame
* reordering.
*
* - encoding: MUST be set by user. * - encoding: MUST be set by user.
* - decoding: May be set by the user before opening the decoder if known e.g. * - decoding: May be set by the user before opening the decoder if known e.g.
* from the container. Some decoders will require the dimensions * from the container. Some decoders will require the dimensions
* to be set by the caller. During decoding, the decoder may * to be set by the caller. During decoding, the decoder may
* overwrite those values as required. * overwrite those values as required while parsing the data.
*/ */
int width, height; int width, height;
/** /**
* Bitstream width / height, may be different from width/height e.g. when * Bitstream width / height, may be different from width/height e.g. when
* the decoded frame is cropped before being output or lowres is enabled. * the decoded frame is cropped before being output or lowres is enabled.
*
* @note Those field may not match the value of the last
* AVFrame outputted by avcodec_decode_video2 due frame
* reordering.
*
* - encoding: unused * - encoding: unused
* - decoding: May be set by the user before opening the decoder if known * - decoding: May be set by the user before opening the decoder if known
* e.g. from the container. During decoding, the decoder may * e.g. from the container. During decoding, the decoder may
* overwrite those values as required. * overwrite those values as required while parsing the data.
*/ */
int coded_width, coded_height; int coded_width, coded_height;
@@ -1438,8 +1448,14 @@ typedef struct AVCodecContext {
* Pixel format, see AV_PIX_FMT_xxx. * Pixel format, see AV_PIX_FMT_xxx.
* May be set by the demuxer if known from headers. * May be set by the demuxer if known from headers.
* May be overridden by the decoder if it knows better. * May be overridden by the decoder if it knows better.
*
* @note This field may not match the value of the last
* AVFrame outputted by avcodec_decode_video2 due frame
* reordering.
*
* - encoding: Set by user. * - encoding: Set by user.
* - decoding: Set by user if known, overridden by libavcodec if known * - decoding: Set by user if known, overridden by libavcodec while
* parsing the data.
*/ */
enum AVPixelFormat pix_fmt; enum AVPixelFormat pix_fmt;