Merge commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab'

* commit 'd336bfcf69fee159e9dba5e5e486ddb1aba61aab':
  pixdesc: fix and extend doxy for av_pix_fmt_get_chroma_sub_sample()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavutil/pixdesc.h
index a6056fe,aea1e38..b1d218d
--- 1/libavutil/pixdesc.h
--- 2/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@@ -286,14 -267,9 +286,14 @@@ enum AVPixelFormat av_pix_fmt_desc_get_
   * Utility function to access log2_chroma_w log2_chroma_h from
   * the pixel format AVPixFmtDescriptor.
   *
 + * See av_get_chroma_sub_sample() for a function that asserts a
 + * valid pixel format instead of returning an error code.
 + * Its recommended that you use avcodec_get_chroma_sub_sample unless
 + * you do check the return code!
 + *
   * @param[in]  pix_fmt the pixel format
-  * @param[out] h_shift store log2_chroma_w
-  * @param[out] v_shift store log2_chroma_h
+  * @param[out] h_shift store log2_chroma_w (horizontal/width shift)
+  * @param[out] v_shift store log2_chroma_h (vertical/height shift)
   *
   * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
   */