diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 19:26:08 +0300 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 19:26:08 +0300 |
| commit | 27558679a1e0738630254d5398c74eb5d7f45c8d (patch) | |
| tree | 30d23b7a32e3a3675e0d8a9220cb1e9a81ce8de3 /libavutil/pixfmt.h | |
| parent | 2691a8399f57cb22f18dfb13e3575dc44bebd22e (diff) | |
| parent | 7480d001312d9ba706333ec970264ed9df3f82cb (diff) | |
Merge commit '7480d001312d9ba706333ec970264ed9df3f82cb'
* commit '7480d001312d9ba706333ec970264ed9df3f82cb':
pixfmt: fix the AV_PIX_FMT_VAAPI_VLD doxy
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/pixfmt.h')
| -rw-r--r-- | libavutil/pixfmt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index dbd24701f5..546eb44440 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -125,7 +125,7 @@ enum AVPixelFormat { /**@{*/ AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers - AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers + AV_PIX_FMT_VAAPI_VLD, ///< HW decoding through VA API, Picture.data[3] contains a VASurfaceID /**@}*/ AV_PIX_FMT_VAAPI = AV_PIX_FMT_VAAPI_VLD, #else |