diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 21:07:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-21 21:08:05 +0200 |
| commit | 30e9ebb14f197bbc3fcbde467da39d1a79ac8d52 (patch) | |
| tree | 5d10386c06d6d0793951bc5179770244ed33f676 /libavcodec | |
| parent | f399f826ee2d1e55bdae1495db9c1885589e4de1 (diff) | |
| parent | 05bf3f54e6078716f6267df530bf1d474ca3d606 (diff) | |
| download | ffmpeg-30e9ebb14f197bbc3fcbde467da39d1a79ac8d52.tar.gz | |
Merge commit '05bf3f54e6078716f6267df530bf1d474ca3d606'
* commit '05bf3f54e6078716f6267df530bf1d474ca3d606':
libvpx: Do not set vp8 only parameters when encoding in vp9
Conflicts:
libavcodec/libvpxenc.c
See: 238ec505e263e7d0363798a05c1c28f494a6300a
See: ae330070ee8b985abb011835502b03baacfbb18c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libvpxenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index b2deb5d93b..a5b750f8ba 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -588,7 +588,8 @@ static av_cold int vpx_init(AVCodecContext *avctx, codecctl_int(avctx, VP8E_SET_ARNR_STRENGTH, ctx->arnr_strength); if (ctx->arnr_type >= 0) codecctl_int(avctx, VP8E_SET_ARNR_TYPE, ctx->arnr_type); - if (avctx->codec_id == AV_CODEC_ID_VP8) { + + if (CONFIG_LIBVPX_VP8_ENCODER && avctx->codec_id == AV_CODEC_ID_VP8) { codecctl_int(avctx, VP8E_SET_NOISE_SENSITIVITY, avctx->noise_reduction); codecctl_int(avctx, VP8E_SET_TOKEN_PARTITIONS, av_log2(avctx->slices)); } |