RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avprobe: Handle unknown values for the color description 

print_str() cannot print NULL.

Bug-Id: 1040
CC: libav-stable@libav.org

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Luca Barbato 2017-04-17 13:48:54 +00:00
parent b812db66af
commit c55f2ae2b8
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
avtools/avprobe.c
View File

@ -609,6 +609,12 @@ static char *tag_string(char *buf, int buf_size, int tag)
return buf; return buf;
} }
static char *unknown_string(char *buf, int buf_size, int val)
{
snprintf(buf, buf_size, "Unknown (%d)", val);
return buf;
}
static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt) static void show_packet(AVFormatContext *fmt_ctx, AVPacket *pkt)
{ {
char val_str[128]; char val_str[128];
@ -660,6 +666,7 @@ static void show_stream(InputFile *ifile, InputStream *ist)
char val_str[128]; char val_str[128];
AVRational display_aspect_ratio, *sar = NULL; AVRational display_aspect_ratio, *sar = NULL;
const AVPixFmtDescriptor *desc; const AVPixFmtDescriptor *desc;
const char *val;
probe_object_header("stream"); probe_object_header("stream");
@ -718,11 +725,30 @@ static void show_stream(InputFile *ifile, InputStream *ist)
probe_str("pix_fmt", desc ? desc->name : "unknown"); probe_str("pix_fmt", desc ? desc->name : "unknown");
probe_int("level", par->level); probe_int("level", par->level);
probe_str("color_range", av_color_range_name (par->color_range)); val = av_color_range_name(par->color_range);
probe_str("color_space", av_color_space_name (par->color_space)); if (!val)
probe_str("color_trc", av_color_transfer_name (par->color_trc)); val = unknown_string(val_str, sizeof(val_str), par->color_range);
probe_str("color_pri", av_color_primaries_name(par->color_primaries)); probe_str("color_range", val);
probe_str("chroma_loc", av_chroma_location_name (par->chroma_location));
val = av_color_space_name(par->color_space);
if (!val)
val = unknown_string(val_str, sizeof(val_str), par->color_space);
probe_str("color_space", val);
val = av_color_transfer_name(par->color_trc);
if (!val)
val = unknown_string(val_str, sizeof(val_str), par->color_trc);
probe_str("color_trc", val);
val = av_color_primaries_name(par->color_primaries);
if (!val)
val = unknown_string(val_str, sizeof(val_str), par->color_primaries);
probe_str("color_pri", val);
val = av_chroma_location_name(par->chroma_location);
if (!val)
val = unknown_string(val_str, sizeof(val_str), par->chroma_location);
probe_str("chroma_loc", val);
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO: