diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-02-25 00:05:08 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-02-25 00:05:08 -0500 |
| commit | 1a7ce50a6c91af97291aa727483030a14a58859f (patch) | |
| tree | 983477557f8eb87a47341c8956a57c2b0ed4385b /vpx/vpx_decoder.h | |
| parent | f8d4a81af20705c4a023689e9c347f079ffe02e5 (diff) | |
| parent | 861175ef001e5211ad9e60221e04da7fd1970d31 (diff) | |
| download | libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.tar libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.tar.gz libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.tar.bz2 libvpx-1a7ce50a6c91af97291aa727483030a14a58859f.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I52f21ff6f9a1dca7099a8459657f6f288c5bfe40
Diffstat (limited to 'vpx/vpx_decoder.h')
| -rw-r--r-- | vpx/vpx_decoder.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vpx/vpx_decoder.h b/vpx/vpx_decoder.h index 6ffc2d440..4c5740945 100644 --- a/vpx/vpx_decoder.h +++ b/vpx/vpx_decoder.h @@ -17,7 +17,7 @@ * @{ */ -/*!\file vpx_decoder.h +/*!\file * \brief Describes the decoder algorithm interface to applications. * * This file describes the interface between an application and a @@ -48,7 +48,7 @@ extern "C" { * ::vpx_codec_iface_t interface structure. Capabilities are extra interfaces * or functionality, and are not required to be supported by a decoder. * - * The available flags are specifiedby VPX_CODEC_CAP_* defines. + * The available flags are specified by VPX_CODEC_CAP_* defines. */ #define VPX_CODEC_CAP_PUT_SLICE 0x10000 /**< Will issue put_slice callbacks */ #define VPX_CODEC_CAP_PUT_FRAME 0x20000 /**< Will issue put_frame callbacks */ @@ -109,7 +109,7 @@ extern "C" { * kept readable and stable until all memory maps have been set. * * \param[in] ctx Pointer to this instance's context. - * \param[in] iface Pointer to the alogrithm interface to use. + * \param[in] iface Pointer to the algorithm interface to use. * \param[in] cfg Configuration to use, if known. May be NULL. * \param[in] flags Bitfield of VPX_CODEC_USE_* flags * \param[in] ver ABI version number. Must be set to @@ -139,7 +139,7 @@ extern "C" { * context is not necessary. Can be used to determine if the bitstream is * of the proper format, and to extract information from the stream. * - * \param[in] iface Pointer to the alogrithm interface + * \param[in] iface Pointer to the algorithm interface * \param[in] data Pointer to a block of data to parse * \param[in] data_sz Size of the data buffer * \param[in,out] si Pointer to stream info to update. The size member |