diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 13:38:45 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-26 13:56:47 +0100 |
| commit | 3c4ca4c5d7992e545a6cbad440287f9e27f1a696 (patch) | |
| tree | 110fffd8d88093550fa8a023e513542ac4742fda /libavcodec/qsvenc_hevc.c | |
| parent | 492d229303a8d4270eda4d3be0e45d9e0caad0a8 (diff) | |
| parent | fa936a307f5cddfc2664600157a8207ca8080af6 (diff) | |
| download | ffmpeg-3c4ca4c5d7992e545a6cbad440287f9e27f1a696.tar.gz | |
Merge commit 'fa936a307f5cddfc2664600157a8207ca8080af6'
* commit 'fa936a307f5cddfc2664600157a8207ca8080af6':
hevc_parse: rename into h2645_parse
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc_hevc.c')
| -rw-r--r-- | libavcodec/qsvenc_hevc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index e0bead90c0..1d1e801cc6 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -31,6 +31,7 @@ #include "bytestream.h" #include "get_bits.h" #include "hevc.h" +#include "h2645_parse.h" #include "internal.h" #include "qsv.h" #include "qsv_internal.h" @@ -54,7 +55,7 @@ static int generate_fake_vps(QSVEncContext *q, AVCodecContext *avctx) PutByteContext pbc; GetBitContext gb; - HEVCNAL sps_nal = { NULL }; + H2645NAL sps_nal = { NULL }; HEVCSPS sps = { 0 }; HEVCVPS vps = { 0 }; uint8_t vps_buf[128], vps_rbsp_buf[128]; @@ -68,7 +69,7 @@ static int generate_fake_vps(QSVEncContext *q, AVCodecContext *avctx) } /* parse the SPS */ - ret = ff_hevc_extract_rbsp(avctx->extradata + 4, avctx->extradata_size - 4, &sps_nal); + ret = ff_h2645_extract_rbsp(avctx->extradata + 4, avctx->extradata_size - 4, &sps_nal); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Error unescaping the SPS buffer\n"); return ret; |