diff options
| author | Mark Thompson <sw@jkqxz.net> | 2018-01-16 23:25:27 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-01-16 23:25:27 +0000 |
| commit | 3895fce26ec7f6d2b1642f96ecaddede6521228e (patch) | |
| tree | 3987bb94bae98ce8b08d31237568d85d27f0993b /libavcodec/amfenc.c | |
| parent | 68de778ccc35bea885a989e47358089da006a8b6 (diff) | |
| parent | 34c113335b53d83ed343de49741f0823aa1f8cc6 (diff) | |
| download | ffmpeg-streaming-3895fce26ec7f6d2b1642f96ecaddede6521228e.zip ffmpeg-streaming-3895fce26ec7f6d2b1642f96ecaddede6521228e.tar.gz | |
Merge commit '34c113335b53d83ed343de49741f0823aa1f8cc6'
* commit '34c113335b53d83ed343de49741f0823aa1f8cc6':
Add support for H.264 and HEVC hardware encoding for AMD GPUs based on AMF SDK
Most of this was already present from 9ea6607d294526688ab1b1342cb36ee159683e88,
this just applies some minor fixups and adds the general documentation.
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/amfenc.c')
| -rw-r--r-- | libavcodec/amfenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index f8b6807..89a10ff 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -157,7 +157,7 @@ static int amf_init_context(AVCodecContext *avctx) AmfContext *ctx = avctx->priv_data; AMF_RESULT res = AMF_OK; - // confugure AMF logger + // configure AMF logger // the return of these functions indicates old state and do not affect behaviour ctx->trace->pVtbl->EnableWriter(ctx->trace, AMF_TRACE_WRITER_DEBUG_OUTPUT, ctx->log_to_dbg != 0 ); if (ctx->log_to_dbg) @@ -414,7 +414,7 @@ static int amf_copy_buffer(AVCodecContext *avctx, AVPacket *pkt, AMFBuffer *buff return 0; } -// amfenc API implmentation +// amfenc API implementation int ff_amf_encode_init(AVCodecContext *avctx) { AmfContext *ctx = avctx->priv_data; |
