diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-29 21:04:33 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-29 21:05:57 -0300 |
| commit | dde7b1d4857fa710113d1fc365bc4ea7707e3156 (patch) | |
| tree | 5cb0791a9c6126ef62a12f8fbe71487563518f87 /libavcodec/qsvenc_h264.c | |
| parent | b0d9eab7f202f439b7c28e23ed1852abc814cd52 (diff) | |
| parent | b843b343d8a3210ae37a2342b1904a5bd1e5fc6e (diff) | |
| download | ffmpeg-dde7b1d4857fa710113d1fc365bc4ea7707e3156.tar.gz | |
Merge commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e'
* commit 'b843b343d8a3210ae37a2342b1904a5bd1e5fc6e':
qsvenc: cavlc option is only available for h264
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/qsvenc_h264.c')
| -rw-r--r-- | libavcodec/qsvenc_h264.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 389335f39d..3242062b40 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -102,6 +102,7 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx) static const AVOption options[] = { QSV_COMMON_OPTS + { "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "pic_timing_sei", "Insert picture timing SEI with pic_struct_syntax element", OFFSET(qsv.pic_timing_sei), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { "single_sei_nal_unit", "Put all the SEI messages into one NALU", OFFSET(qsv.single_sei_nal_unit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, @@ -154,7 +155,9 @@ static const AVCodecDefault qsv_enc_defaults[] = { // same as the x264 default { "g", "250" }, { "bf", "3" }, - { "coder", "ac" }, +#if FF_API_CODER_TYPE + { "coder", "-1" }, +#endif { "flags", "+cgop" }, #if FF_API_PRIVATE_OPT |