diff options
| author | James Zern <jzern@google.com> | 2019-07-01 22:17:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-07-01 22:17:46 +0000 |
| commit | cd9f1763c861edfd86d2814e029a34f3ce821e72 (patch) | |
| tree | 8bb16c95fd1ea7ec33a0393dbe5a47bccfa68550 | |
| parent | c33c7ca85fa7b28658f3b086d579a7fbbcf41dea (diff) | |
| parent | ae3c6e9ec7dbaad8ee507b1c531c54bdc0141e9f (diff) | |
| download | libvpx-cd9f1763c861edfd86d2814e029a34f3ce821e72.tar libvpx-cd9f1763c861edfd86d2814e029a34f3ce821e72.tar.gz libvpx-cd9f1763c861edfd86d2814e029a34f3ce821e72.tar.bz2 libvpx-cd9f1763c861edfd86d2814e029a34f3ce821e72.zip | |
Merge "vp9_cx_iface,encoder_encode: fix -Wclobbered for pts"
| -rw-r--r-- | vp9/vp9_cx_iface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index a63574e64..45e03f2de 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -1099,12 +1099,13 @@ static vpx_codec_frame_flags_t get_frame_pkt_flags(const VP9_COMP *cpi, const size_t kMinCompressedSize = 8192; static vpx_codec_err_t encoder_encode(vpx_codec_alg_priv_t *ctx, const vpx_image_t *img, - vpx_codec_pts_t pts, + vpx_codec_pts_t pts_val, unsigned long duration, vpx_enc_frame_flags_t enc_flags, unsigned long deadline) { volatile vpx_codec_err_t res = VPX_CODEC_OK; volatile vpx_enc_frame_flags_t flags = enc_flags; + volatile vpx_codec_pts_t pts = pts_val; VP9_COMP *const cpi = ctx->cpi; const vpx_rational64_t *const timestamp_ratio = &ctx->timestamp_ratio; size_t data_sz; |