diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 21:49:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-17 21:50:06 +0200 |
| commit | ecb7f1dd52798e591984b31009e8d13dc95958b2 (patch) | |
| tree | 374372105d56b936c06dd3514722927f29945d82 | |
| parent | c939eea107c36b4ab93540f24fdb1cb5417a0eae (diff) | |
| parent | 304089aca7d238ae184e09993b5c737aa22e2c2c (diff) | |
| download | ffmpeg-ecb7f1dd52798e591984b31009e8d13dc95958b2.tar.gz | |
Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'
* commit '304089aca7d238ae184e09993b5c737aa22e2c2c':
mxf: Add UID print helpers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mxf.h | 12 | ||||
| -rw-r--r-- | libavformat/mxfdec.c | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/libavformat/mxf.h b/libavformat/mxf.h index cf7ec0bab5..036c15ebac 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -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, \ diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index ed1cecbf46..07b2eca0c1 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -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) |