diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 16:59:06 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-03 16:59:06 +0000 |
| commit | 74f5cb0189d61affc6550723c1f82d4ae76df1d5 (patch) | |
| tree | d576518c7a688bbe128a8474fe290c14fec0eee9 /libavutil/pixdesc.h | |
| parent | 27acb64a53375e1253b5a4c3299b04ade1dc1c1d (diff) | |
| parent | d336bfcf69fee159e9dba5e5e486ddb1aba61aab (diff) | |
| download | ffmpeg-74f5cb0189d61affc6550723c1f82d4ae76df1d5.tar.gz | |
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>
Diffstat (limited to 'libavutil/pixdesc.h')
| -rw-r--r-- | libavutil/pixdesc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h index a6056fe1c0..b1d218db48 100644 --- a/libavutil/pixdesc.h +++ b/libavutil/pixdesc.h @@ -292,8 +292,8 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc); * 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 */ |