diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-14 11:39:23 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-11-14 11:39:23 +0000 |
| commit | e3efa72a6718fe380764085985e35bbc0fb98c60 (patch) | |
| tree | 11ed981f09bc81f900abc60f7d1a0257c59d15f3 /codec-cfg.c | |
| parent | fae622c10f5185032a8a1ca20650df77ec4d5ff2 (diff) | |
| download | mpv-e3efa72a6718fe380764085985e35bbc0fb98c60.tar.bz2 mpv-e3efa72a6718fe380764085985e35bbc0fb98c60.tar.xz | |
fix crash when a "driver" line is missing in codecs.conf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13937 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'codec-cfg.c')
| -rw-r--r-- | codec-cfg.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 0b15fcade3..e53d17bca5 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -332,13 +332,12 @@ static int validate_codec(codecs_t *c, int type) mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CodecLacksFourcc, c->name); return 0; } +#endif - /* XXX fix this: shitty with 'null' codec */ - if (!c->driver) { + if (!c->drv) { mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CodecLacksDriver, c->name); return 0; } -#endif #if 0 #warning codec->driver == 4;... <- ezt nem kellene belehegeszteni... @@ -746,8 +745,10 @@ static void codecs_free(codecs_t* codecs,int count) { } void codecs_uninit_free() { + if (video_codecs) codecs_free(video_codecs,nr_vcodecs); video_codecs=NULL; + if (audio_codecs) codecs_free(audio_codecs,nr_acodecs); audio_codecs=NULL; } |