Merge commit '9af7e8045e3e63ab39adedae9a7c11b1c410af26'

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

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/avcodec.h
index 4aeb57aed40a6d5c5433599de0c430b40d224deb,7edea2c5bceaea24b33681f90bad3ed9883e30f7..6fdeb4f6ffe73da466753a8c0b75cb1d97ce3656
--- 1/libavcodec/avcodec.h
--- 2/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@@ -1415,7 -1232,12 +1420,12 @@@ typedef struct AVCodecContext 
  
      /**
       * Bitstream width / height, may be different from width/height e.g. when
 -     * the decoded frame is cropped before being output.
 +     * 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
       * - decoding: May be set by the user before opening the decoder if known
       *             e.g. from the container. During decoding, the decoder may
@@@ -1437,9 -1259,15 +1447,15 @@@
      /**
       * Pixel format, see AV_PIX_FMT_xxx.
       * May be set by the demuxer if known from headers.
 -     * May be overriden 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.
-      * - 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;