diff options
author | Anton Khirnov <anton@khirnov.net> | 2014-01-16 18:40:37 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-28 12:20:22 +0400 |
commit | f99e581ae13c2c563f66cb0c31d3dfceeec21af7 (patch) | |
tree | 8309cd550b5b1fba428879b31c12411b91c4caaf /source/gameengine/VideoTexture/VideoFFmpeg.cpp | |
parent | 414e40c353cad08493e90585cd1261297c96570f (diff) |
libavformat API usage: use avformat_close_input() instead of av_close_input_file()
Diffstat (limited to 'source/gameengine/VideoTexture/VideoFFmpeg.cpp')
-rw-r--r-- | source/gameengine/VideoTexture/VideoFFmpeg.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/VideoTexture/VideoFFmpeg.cpp b/source/gameengine/VideoTexture/VideoFFmpeg.cpp index 7b48d47232b..139988f64ea 100644 --- a/source/gameengine/VideoTexture/VideoFFmpeg.cpp +++ b/source/gameengine/VideoTexture/VideoFFmpeg.cpp @@ -99,7 +99,7 @@ bool VideoFFmpeg::release() } if (m_formatCtx) { - av_close_input_file(m_formatCtx); + avformat_close_input(&m_formatCtx); m_formatCtx = NULL; } if (m_frame) @@ -176,7 +176,7 @@ int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AV if (avformat_find_stream_info(formatCtx, NULL) < 0) { - av_close_input_file(formatCtx); + avformat_close_input(&formatCtx); return -1; } @@ -195,7 +195,7 @@ int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AV if (videoStream==-1) { - av_close_input_file(formatCtx); + avformat_close_input(&formatCtx); return -1; } @@ -205,13 +205,13 @@ int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AV codec=avcodec_find_decoder(codecCtx->codec_id); if (codec==NULL) { - av_close_input_file(formatCtx); + avformat_close_input(&formatCtx); return -1; } codecCtx->workaround_bugs = 1; if (avcodec_open2(codecCtx, codec, NULL) < 0) { - av_close_input_file(formatCtx); + avformat_close_input(&formatCtx); return -1; } @@ -278,7 +278,7 @@ int VideoFFmpeg::openStream(const char *filename, AVInputFormat *inputFormat, AV if (!m_imgConvertCtx) { avcodec_close(m_codecCtx); m_codecCtx = NULL; - av_close_input_file(m_formatCtx); + avformat_close_input(&m_formatCtx); m_formatCtx = NULL; av_free(m_frame); m_frame = NULL; |