Commit ecb7f1dd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '304089ac'

* commit '304089ac':
  mxf: Add UID print helpers
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents c939eea1 304089ac
......@@ -79,6 +79,18 @@ extern const MXFCodecUL ff_mxf_pixel_format_uls[];
int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum AVPixelFormat *pix_fmt);
const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base);
#define PRIxUID \
"%02x.%02x.%02x.%02x." \
"%02x.%02x.%02x.%02x." \
"%02x.%02x.%02x.%02x." \
"%02x.%02x.%02x.%02x"
#define UID_ARG(x) \
(x)[0], (x)[1], (x)[2], (x)[3], \
(x)[4], (x)[5], (x)[6], (x)[7], \
(x)[8], (x)[9], (x)[10], (x)[11], \
(x)[12], (x)[13], (x)[14], (x)[15] \
#ifdef DEBUG
#define PRINT_KEY(pc, s, x) \
av_log(pc, AV_LOG_VERBOSE, \
......
......@@ -2210,6 +2210,9 @@ static int mxf_read_header(AVFormatContext *s)
return res;
}
break;
} else {
av_log(s, AV_LOG_VERBOSE, "Dark key " PRIxUID "\n",
UID_ARG(klv.key));
}
}
if (!metadata->read)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment