storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Make sure a couple pointers are initialized before use.

Browse Source
This commit is contained in:
Justin Maggard 2011-04-08 21:54:04 +00:00
parent a8d204dd0d
commit e32a1b1d27
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
metadata.c
View File

@ -642,7 +642,7 @@ GetVideoMetadata(const char * path, char * name)
int ret, i; int ret, i;
struct tm *modtime; struct tm *modtime;
AVFormatContext *ctx; AVFormatContext *ctx;
AVCodecContext *ac, *vc; AVCodecContext *ac = NULL, *vc = NULL;
int audio_stream = -1, video_stream = -1; int audio_stream = -1, video_stream = -1;
enum audio_profiles audio_profile = PROFILE_AUDIO_UNKNOWN; enum audio_profiles audio_profile = PROFILE_AUDIO_UNKNOWN;
tsinfo_t *ts; tsinfo_t *ts;
@ -691,7 +691,7 @@ GetVideoMetadata(const char * path, char * name)
} }
} }
/* This must not be a video file. */ /* This must not be a video file. */
if( video_stream == -1 ) if( !vc )
{ {
av_close_input_file(ctx); av_close_input_file(ctx);
if( !is_audio(path) ) if( !is_audio(path) )
@ -717,7 +717,7 @@ GetVideoMetadata(const char * path, char * name)
strftime(m.date, 20, "%FT%T", modtime); strftime(m.date, 20, "%FT%T", modtime);
} }
if( audio_stream >= 0 ) if( ac )
{ {
switch( ac->codec_id ) switch( ac->codec_id )
{ {
@ -805,7 +805,7 @@ GetVideoMetadata(const char * path, char * name)
#endif #endif
asprintf(&m.channels, "%u", ac->channels); asprintf(&m.channels, "%u", ac->channels);
} }
if( video_stream >= 0 ) if( vc )
{ {
DPRINTF(E_DEBUG, L_METADATA, "Container: '%s' [%s]\n", ctx->iformat->name, basename(path)); DPRINTF(E_DEBUG, L_METADATA, "Container: '%s' [%s]\n", ctx->iformat->name, basename(path));
asprintf(&m.resolution, "%dx%d", vc->width, vc->height); asprintf(&m.resolution, "%dx%d", vc->width, vc->height);