griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

libavformat API usage: use avformat_close_input() instead of av_close_input_file()

Browse Source
This commit is contained in:
Anton Khirnov
2014-01-16 15:40:37 +01:00
committed by Sergey Sharybin
parent 414e40c353
commit f99e581ae1
5 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/gameengine/VideoTexture/VideoFFmpeg.cpp
View File

@@ -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;