diff options
author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-10-02 12:44:33 +0400 |
---|---|---|
committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2010-10-02 12:44:33 +0400 |
commit | a5c33faaccec6787419fe373a9e7ae0932b15ee1 (patch) | |
tree | 9b0f45a55539b3260f1db09053eb450435dfce7d /ffmpeg.c | |
parent | 05931ab763c873198947142fc84dfe6c8c285fd6 (diff) |
Add init and uninit functions to cmdutils, reduces code duplication
between ffmpeg and ffplay and avoids a valgrind error by freeing
avformat_opts->key.
Originally committed as revision 25309 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r-- | ffmpeg.c | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -636,10 +636,7 @@ static int ffmpeg_exit(int ret) av_free(video_standard); - for (i=0;i<AVMEDIA_TYPE_NB;i++) - av_free(avcodec_opts[i]); - av_free(avformat_opts); - av_free(sws_opts); + uninit_opts(); av_free(audio_buf); av_free(audio_out); allocated_audio_buf_size= allocated_audio_out_size= 0; @@ -4336,7 +4333,6 @@ static const OptionDef options[] = { int main(int argc, char **argv) { - int i; int64_t ti; av_log_set_flags(AV_LOG_SKIP_REPEATED); @@ -4355,11 +4351,7 @@ int main(int argc, char **argv) url_set_interrupt_cb(decode_interrupt_cb); #endif - for(i=0; i<AVMEDIA_TYPE_NB; i++){ - avcodec_opts[i]= avcodec_alloc_context2(i); - } - avformat_opts = avformat_alloc_context(); - sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL); + init_opts(); show_banner(); |