RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '49e531ff4706279c7eed774f2c8b896942924ce2' 

* commit '49e531ff4706279c7eed774f2c8b896942924ce2':
  mmal: Reference MMAL VC lib explicitly

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-14 13:40:36 +02:00
parent 7c521d4528 49e531ff47
commit 6e86ee97c8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/mmaldec.c
View File

@ -29,6 +29,7 @@
#include <interface/mmal/util/mmal_util.h> #include <interface/mmal/util/mmal_util.h>
#include <interface/mmal/util/mmal_util_params.h> #include <interface/mmal/util/mmal_util_params.h>
#include <interface/mmal/util/mmal_default_components.h> #include <interface/mmal/util/mmal_default_components.h>
#include <interface/mmal/vc/mmal_vc_api.h>
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
@ -182,6 +183,8 @@ static av_cold int ffmmal_close_decoder(AVCodecContext *avctx)
if (ctx->bsfc) if (ctx->bsfc)
av_bitstream_filter_close(ctx->bsfc); av_bitstream_filter_close(ctx->bsfc);
mmal_vc_deinit();
return 0; return 0;
} }
@ -321,6 +324,11 @@ static av_cold int ffmmal_init_decoder(AVCodecContext *avctx)
bcm_host_init(); bcm_host_init();
if (mmal_vc_init()) {
av_log(avctx, AV_LOG_ERROR, "Cannot initialize MMAL VC driver!\n");
return AVERROR(ENOSYS);
}
if ((ret = ff_get_format(avctx, avctx->codec->pix_fmts)) < 0) if ((ret = ff_get_format(avctx, avctx->codec->pix_fmts)) < 0)
return ret; return ret;