diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 13:29:29 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-12 13:29:29 +0200 |
| commit | 30fb54c23f520c4bd1f6563ea1821de96b8f4a17 (patch) | |
| tree | 9f2838d1f34c25b9644dbe73f1b5a6a1bfb84c06 /libavcodec/mmaldec.c | |
| parent | 45ae2997858d408b140d0f785dbb0f09369b7367 (diff) | |
| parent | b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb (diff) | |
| download | ffmpeg-30fb54c23f520c4bd1f6563ea1821de96b8f4a17.tar.gz | |
Merge commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb'
* commit 'b7ab6e18eecad43593ad2a0e9fc9eba7f24751cb':
mmaldec: disable timestamp interpolation
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mmaldec.c')
| -rw-r--r-- | libavcodec/mmaldec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index a749b8964f..b1b276a005 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -26,6 +26,7 @@ #include <bcm_host.h> #include <interface/mmal/mmal.h> +#include <interface/mmal/mmal_parameters_video.h> #include <interface/mmal/util/mmal_util.h> #include <interface/mmal/util/mmal_util_params.h> #include <interface/mmal/util/mmal_default_components.h> @@ -277,6 +278,9 @@ static int ffmal_update_format(AVCodecContext *avctx) if ((status = mmal_port_parameter_set_uint32(decoder->output[0], MMAL_PARAMETER_EXTRA_BUFFERS, ctx->extra_buffers))) goto fail; + if ((status = mmal_port_parameter_set_boolean(decoder->output[0], MMAL_PARAMETER_VIDEO_INTERPOLATE_TIMESTAMPS, 0))) + goto fail; + if (avctx->pix_fmt == AV_PIX_FMT_MMAL) { format_out->encoding = MMAL_ENCODING_OPAQUE; } else { |