mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix logic and possible memleak

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-11-17 06:34:13 +01:00
parent e0effa50e2
commit 545fb415b2
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libarmbox/video.cpp
View File

@@ -220,15 +220,19 @@ int decode_frame(AVCodecContext *codecContext,AVPacket &packet, FILE* fp)
AVCodecContext* open_codec(AVMediaType mediaType, AVFormatContext* formatContext) AVCodecContext* open_codec(AVMediaType mediaType, AVFormatContext* formatContext)
{ {
int stream_index = av_find_best_stream(formatContext, mediaType, -1, -1, NULL, 0); int stream_index = av_find_best_stream(formatContext, mediaType, -1, -1, NULL, 0);
if (stream_index < 0){ if (stream_index >=0 ){
return NULL; AVCodecContext * codecContext = formatContext->streams[stream_index]->codec;
if(codecContext){
AVCodec *codec = avcodec_find_decoder(codecContext->codec_id);
if(codec){
if ((avcodec_open2(codecContext, codec, NULL)) != 0){
return NULL;
}
}
return codecContext;
}
} }
AVCodecContext * codecContext = formatContext->streams[stream_index]->codec; return NULL;
AVCodec *codec = avcodec_find_decoder(codecContext->codec_id);
if (codec && (avcodec_open2(codecContext, codec, NULL)) != 0){
return NULL;
}
return codecContext;
} }
int image_to_mpeg2(const char *image_name, const char *encode_name) int image_to_mpeg2(const char *image_name, const char *encode_name)
@@ -253,11 +257,11 @@ int image_to_mpeg2(const char *image_name, const char *encode_name)
} }
fclose(fp); fclose(fp);
} }
avcodec_close(codecContext);
av_free_packet(&packet); av_free_packet(&packet);
} }
avformat_close_input(&formatContext); avcodec_close(codecContext);
} }
avformat_close_input(&formatContext);
} }
av_free(formatContext); av_free(formatContext);
return 0; return 0;